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.

diff --git a/CHANGES b/CHANGES
index 801432f471af880e241c101453ff1c6250c08553..7bca0f54740b89cf3b8f73df9e58869d31796a63 100644 (file)
--- 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 35b9718b63475007f946c24efac6e6d43bfc4013..dbe8a801e9ff5252e2166b21edcd5aeebe652af5 100644 (file)
--- 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 806b3578cc8a44c24de901e9954cdace3b3bc345..18616d0c8eae1c3ebb67f880a702a81df501210f 100644 (file)
--- 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>]