rename missing-crl to missing-revoke
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16898 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -109,7 +109,7 @@ hx509_context_init(hx509_context *context)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
hx509_context_set_missing_crl(hx509_context context, int flag)
|
hx509_context_set_missing_revoke(hx509_context context, int flag)
|
||||||
{
|
{
|
||||||
if (flag)
|
if (flag)
|
||||||
context->flags |= HX509_CTX_VERIFY_MISSING_OK;
|
context->flags |= HX509_CTX_VERIFY_MISSING_OK;
|
||||||
|
@@ -86,9 +86,9 @@ command = {
|
|||||||
help = "password, prompter, or environment"
|
help = "password, prompter, or environment"
|
||||||
}
|
}
|
||||||
option = {
|
option = {
|
||||||
long = "missing-crl"
|
long = "missing-revoke"
|
||||||
type = "flag"
|
type = "flag"
|
||||||
help = "missing crl is ok"
|
help = "missing CRL/OCSP is ok"
|
||||||
}
|
}
|
||||||
option = {
|
option = {
|
||||||
long = "content-info"
|
long = "content-info"
|
||||||
@@ -159,9 +159,9 @@ command = {
|
|||||||
help = "password, prompter, or environment"
|
help = "password, prompter, or environment"
|
||||||
}
|
}
|
||||||
option = {
|
option = {
|
||||||
long = "missing-crl"
|
long = "missing-revoke"
|
||||||
type = "flag"
|
type = "flag"
|
||||||
help = "missing crl is ok"
|
help = "missing CRL/OCSP is ok"
|
||||||
}
|
}
|
||||||
option = {
|
option = {
|
||||||
long = "verbose"
|
long = "verbose"
|
||||||
|
@@ -83,8 +83,8 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
|
|||||||
size_t sz;
|
size_t sz;
|
||||||
void *p;
|
void *p;
|
||||||
|
|
||||||
if (opt->missing_crl_flag)
|
if (opt->missing_revoke_flag)
|
||||||
hx509_context_set_missing_crl(context, 1);
|
hx509_context_set_missing_revoke(context, 1);
|
||||||
|
|
||||||
hx509_lock_init(context, &lock);
|
hx509_lock_init(context, &lock);
|
||||||
lock_strings(lock, &opt->pass_strings);
|
lock_strings(lock, &opt->pass_strings);
|
||||||
@@ -560,8 +560,8 @@ pcert_verify(struct verify_options *opt, int argc, char **argv)
|
|||||||
struct verify v;
|
struct verify v;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (opt->missing_crl_flag)
|
if (opt->missing_revoke_flag)
|
||||||
hx509_context_set_missing_crl(context, 1);
|
hx509_context_set_missing_revoke(context, 1);
|
||||||
|
|
||||||
ret = hx509_verify_init_ctx(context, &ctx);
|
ret = hx509_verify_init_ctx(context, &ctx);
|
||||||
ret = hx509_certs_init(context, "MEMORY:anchors", 0, NULL, &anchors);
|
ret = hx509_certs_init(context, "MEMORY:anchors", 0, NULL, &anchors);
|
||||||
|
@@ -45,14 +45,14 @@ echo "create signed data"
|
|||||||
|
|
||||||
echo "verify signed data"
|
echo "verify signed data"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
sd.data sd.data.out || exit 1
|
sd.data sd.data.out || exit 1
|
||||||
cmp "$srcdir/test_chain.in" sd.data.out || exit 1
|
cmp "$srcdir/test_chain.in" sd.data.out || exit 1
|
||||||
|
|
||||||
echo "verify signed data"
|
echo "verify signed data"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/test.crt \
|
--anchors=FILE:$srcdir/data/test.crt \
|
||||||
sd.data sd.data.out && exit 1
|
sd.data sd.data.out && exit 1
|
||||||
cmp "$srcdir/test_chain.in" sd.data.out || exit 1
|
cmp "$srcdir/test_chain.in" sd.data.out || exit 1
|
||||||
@@ -67,7 +67,7 @@ echo "create signed data (content info)"
|
|||||||
|
|
||||||
echo "verify signed data (content info)"
|
echo "verify signed data (content info)"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
--content-info \
|
--content-info \
|
||||||
sd.data sd.data.out || exit 1
|
sd.data sd.data.out || exit 1
|
||||||
@@ -83,7 +83,7 @@ echo "create signed data"
|
|||||||
|
|
||||||
echo "verify signed data"
|
echo "verify signed data"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
--content-info \
|
--content-info \
|
||||||
"$srcdir/data/test-signed-data" sd.data.out || exit 1
|
"$srcdir/data/test-signed-data" sd.data.out || exit 1
|
||||||
@@ -91,7 +91,7 @@ cmp "$srcdir/data/static-file" sd.data.out || exit 1
|
|||||||
|
|
||||||
echo "verify signed data (no attr)"
|
echo "verify signed data (no attr)"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
--content-info \
|
--content-info \
|
||||||
"$srcdir/data/test-signed-data-noattr" sd.data.out || exit 1
|
"$srcdir/data/test-signed-data-noattr" sd.data.out || exit 1
|
||||||
@@ -99,14 +99,14 @@ cmp "$srcdir/data/static-file" sd.data.out || exit 1
|
|||||||
|
|
||||||
echo "verify failure signed data (no attr, no certs)"
|
echo "verify failure signed data (no attr, no certs)"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
--content-info \
|
--content-info \
|
||||||
"$srcdir/data/test-signed-data-noattr-nocerts" sd.data.out && exit 1
|
"$srcdir/data/test-signed-data-noattr-nocerts" sd.data.out && exit 1
|
||||||
|
|
||||||
echo "verify signed data (no attr, no certs)"
|
echo "verify signed data (no attr, no certs)"
|
||||||
./hxtool cms-verify-sd \
|
./hxtool cms-verify-sd \
|
||||||
--missing-crl \
|
--missing-revoke \
|
||||||
--anchors=FILE:$srcdir/data/ca.crt \
|
--anchors=FILE:$srcdir/data/ca.crt \
|
||||||
--certificate=FILE:$srcdir/data/test.crt \
|
--certificate=FILE:$srcdir/data/test.crt \
|
||||||
--content-info \
|
--content-info \
|
||||||
|
Reference in New Issue
Block a user