Oops! Get the pmatch test the right way round.

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 5004b6fc0eed1d101134ec0e7a765a2a79a2b3c0..23419495171c2381ace2891c03524d4251315604 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -83,8 +83,8 @@ typedef unsigned int u_int;
 #include <openssl/ssl.h>
 #include "s_apps.h"
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
-                             and that isn't in VMS < 7.0 */
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
@@ -158,6 +158,7 @@ extern int verify_depth;
 
 static char *cipher=NULL;
 static int s_server_verify=SSL_VERIFY_NONE;
+static int s_server_session_id_context = 1; /* anything will do */
 static char *s_cert_file=TEST_CERT,*s_key_file=NULL;
 static char *s_dcert_file=NULL,*s_dkey_file=NULL;
 #ifdef FIONBIO
@@ -521,6 +522,8 @@ bad:
        if (cipher != NULL)
                SSL_CTX_set_cipher_list(ctx,cipher);
        SSL_CTX_set_verify(ctx,s_server_verify,verify_callback);
+       SSL_CTX_set_session_id_context(ctx,(void*)&s_server_session_id_context,
+               sizeof s_server_session_id_context);
 
        SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(CAfile));
 
@@ -628,7 +631,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                FD_SET(fileno(stdin),&readfds);
 #endif
                FD_SET(s,&readfds);
-               /* Note: under VMS with SOCKETSHR the third parameter is
+               /* Note: under VMS with SOCKETSHR the second parameter is
                 * currently of type (int *) whereas under other systems
                 * it is (void *) if you don't have a cast it will choke
                 * the compiler: if you do have a cast then you can either