From ea14a91f64c1d277f6899c5e451202d5a4e42f6d Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Thu, 25 Feb 1999 11:26:26 +0000 Subject: [PATCH] Move s_server -dcert and -dkey options out of the undocumented feature area because they are useful for the DSA situation and should be recognized by the users. Thanks to Steve for the original hint. --- CHANGES | 5 +++++ apps/s_server.c | 2 ++ doc/openssl.pod | 2 ++ 3 files changed, 9 insertions(+) diff --git a/CHANGES b/CHANGES index 801432f471..7bca0f5474 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,11 @@ Changes between 0.9.1c and 0.9.2 + *) Move s_server -dcert and -dkey options out of the undocumented feature + area because they are useful for the DSA situation and should be + recognized by the users. + [Ralf S. Engelschall] + *) Fix the cipher decision scheme for export ciphers: the export bits are *not* within SSL_MKEY_MASK or SSL_AUTH_MASK, they are within SSL_EXP_MASK. So, the original variable has to be used instead of the diff --git a/apps/s_server.c b/apps/s_server.c index 35b9718b63..dbe8a801e9 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -196,6 +196,8 @@ static void sv_usage() BIO_printf(bio_err," (default is %s)\n",TEST_CERT); BIO_printf(bio_err," -key arg - RSA file to use, PEM format assumed, in cert file if\n"); BIO_printf(bio_err," not specified (default is %s)\n",TEST_CERT); + BIO_printf(bio_err," -dcert arg - second certificate file to use (usually for DSA)\n"); + BIO_printf(bio_err," -dkey arg - second private key file to use (usually for DSA)\n"); #ifdef FIONBIO BIO_printf(bio_err," -nbio - Run with non-blocking IO\n"); #endif diff --git a/doc/openssl.pod b/doc/openssl.pod index 806b3578cc..18616d0c8e 100644 --- a/doc/openssl.pod +++ b/doc/openssl.pod @@ -263,6 +263,8 @@ SSL/TLS. [B<-Verify> I] [B<-cert> I] [B<-key> I] +[B<-dcert> I] +[B<-dkey> I] [B<-nbio>] [B<-nbio_test>] [B<-debug>]