diff options
| author | Nils Larsch <nils@openssl.org> | 2005-09-02 12:27:02 +0000 |
|---|---|---|
| committer | Nils Larsch <nils@openssl.org> | 2005-09-02 12:27:02 +0000 |
| commit | 3b2ba5f7fb69f83c68c81c9ab4c0164e04adb583 (patch) | |
| tree | 48e8dd8a671686bd97f5bc823ce77f20576188be /apps | |
| parent | 7f622f6c04f149e7402c6f2f5c49bb9c69f4e891 (diff) | |
don't try to load cert/key when the "-nocert" option is set
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index f83dd82343..0d6727ca43 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -832,21 +832,24 @@ bad: if (s_key_file == NULL) s_key_file = s_cert_file; - s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e, - "server certificate private key file"); - if (!s_key) + if (nocert == 0) { - ERR_print_errors(bio_err); - goto end; - } + s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e, + "server certificate private key file"); + if (!s_key) + { + ERR_print_errors(bio_err); + goto end; + } - s_cert = load_cert(bio_err,s_cert_file,s_cert_format, + s_cert = load_cert(bio_err,s_cert_file,s_cert_format, NULL, e, "server certificate file"); - if (!s_cert) - { - ERR_print_errors(bio_err); - goto end; + if (!s_cert) + { + ERR_print_errors(bio_err); + goto end; + } } if (s_dcert_file) |