diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-09 07:03:02 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-09 07:03:02 +0000 |
| commit | 06b71aec85503e8ba77f0277a2e58655622d5bb8 (patch) | |
| tree | af7d0eb447d0da31bc5ebe1364bb5af07e2351b9 /apps | |
| parent | 527cc9841ce4a69df25a24675a144f3a1d0bc5e0 (diff) | |
| download | openssl-06b71aec85503e8ba77f0277a2e58655622d5bb8.tar.gz | |
Merge of main trunk, no conflicts this time
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/makeapps.com | 4 | ||||
| -rw-r--r-- | apps/verify.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/makeapps.com b/apps/makeapps.com index 94acbf8219..7e9d0ac8d6 100644 --- a/apps/makeapps.com +++ b/apps/makeapps.com @@ -154,13 +154,13 @@ $! Define The Application Files. $! $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+- "CA;PKCS7;CRL2P7;CRL;"+- - "RSA;DSA;DSAPARAM;"+- + "RSA;RSAUTL;DSA;DSAPARAM;"+- "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+- "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+- "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND" $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,- CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,- - RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,- + RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,- X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,- S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,- CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ diff --git a/apps/verify.c b/apps/verify.c index e2f571032e..f384de6d29 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -73,7 +73,7 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx); static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose); static STACK_OF(X509) *load_untrusted(char *file); -static int v_verbose=0; +static int v_verbose=0, issuer_checks = 0; int MAIN(int, char **); @@ -147,6 +147,8 @@ int MAIN(int argc, char **argv) } else if (strcmp(*argv,"-help") == 0) goto end; + else if (strcmp(*argv,"-issuer_checks") == 0) + issuer_checks=1; else if (strcmp(*argv,"-verbose") == 0) v_verbose=1; else if (argv[0][0] == '-') @@ -284,6 +286,8 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X X509_STORE_CTX_init(csc,ctx,x,uchain); if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain); if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose); + if(issuer_checks) + X509_STORE_CTX_set_flags(csc, X509_V_FLAG_CB_ISSUER_CHECK); i=X509_verify_cert(csc); X509_STORE_CTX_free(csc); |