diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 16:10:24 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 16:10:24 +0000 |
| commit | e323afb0ce53775645beb78d6e5832a439c099b2 (patch) | |
| tree | dda566e0cef2baae2d94a16dcdd46887aaf86796 /apps/s_server.c | |
| parent | 1fd43fd86e2cbad14187a647d5f51ca9fcf05d83 (diff) | |
Update from HEAD.
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 6c9e6baba4..456952ea7f 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -835,8 +835,8 @@ static char *jpake_secret = NULL; int MAIN(int argc, char *argv[]) { - X509_STORE *store = NULL; - int vflags = 0; + X509_VERIFY_PARAM *vpm = NULL; + int badarg = 0; short port=PORT; char *CApath=NULL,*CAfile=NULL; unsigned char *context = NULL; @@ -1001,13 +1001,11 @@ int MAIN(int argc, char *argv[]) if (--argc < 1) goto bad; CApath= *(++argv); } - else if (strcmp(*argv,"-crl_check") == 0) + else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) { - vflags |= X509_V_FLAG_CRL_CHECK; - } - else if (strcmp(*argv,"-crl_check_all") == 0) - { - vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL; + if (badarg) + goto bad; + continue; } else if (strcmp(*argv,"-verify_return_error") == 0) verify_return_error = 1; @@ -1412,8 +1410,8 @@ bad: ERR_print_errors(bio_err); /* goto end; */ } - store = SSL_CTX_get_cert_store(ctx); - X509_STORE_set_flags(store, vflags); + if (vpm) + SSL_CTX_set1_param(ctx, vpm); #ifndef OPENSSL_NO_TLSEXT if (s_cert2) @@ -1464,8 +1462,8 @@ bad: { ERR_print_errors(bio_err); } - store = SSL_CTX_get_cert_store(ctx2); - X509_STORE_set_flags(store, vflags); + if (vpm) + SSL_CTX_set1_param(ctx2, vpm); } #endif |