diff options
author | Ralf S. Engelschall <rse@openssl.org> | 1999-02-25 11:26:26 +0000 |
---|---|---|
committer | Ralf S. Engelschall <rse@openssl.org> | 1999-02-25 11:26:26 +0000 |
commit | ea14a91f64c1d277f6899c5e451202d5a4e42f6d (patch) | |
tree | 0fa66fd9ea43d0b222c96eda96c5eb6a4d485742 | |
parent | 4b8f2ce648be38595bcc88fbf62b7022c6c3c4d5 (diff) |
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.
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | apps/s_server.c | 2 | ||||
-rw-r--r-- | doc/openssl.pod | 2 |
3 files changed, 9 insertions, 0 deletions
@@ -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<arg>] [B<-cert> I<arg>] [B<-key> I<arg>] +[B<-dcert> I<arg>] +[B<-dkey> I<arg>] [B<-nbio>] [B<-nbio_test>] [B<-debug>] |