oops, revert unrelated changes

diff --git a/apps/s_client.c b/apps/s_client.c
index d7249814ac329b186ae03ac76cb5b5520cf126c3..dbc0700ded2fc9da4d4210a2fe06f0de4dc84752 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2056,7 +2056,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
        }
 #endif
 
-#ifndef SSL_DEBUG
+#ifdef SSL_DEBUG
        {
        /* Print out local port of connection: useful for debugging */
        int sock;

diff --git a/demos/certs/mkcerts.sh b/demos/certs/mkcerts.sh
index 2cf39482c78b479b458a96b4a2361163cadc0d33..0d55e8f846e6e6ad587179dc97ba8b247722aa4a 100644 (file)
--- a/demos/certs/mkcerts.sh
+++ b/demos/certs/mkcerts.sh
@@ -30,10 +30,7 @@ $OPENSSL x509 -req -in creq.pem -CA intca.pem -CAkey intkey.pem -days 3600 \
 
 # First DH parameters
 
-$OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_prime_len:1024 -out dhp.pem
-
-# Uncomment out this line for X9.42 DH parameters instead
-$OPENSSL genpkey -genparam -algorithm DH -out dhp.pem -pkeyopt dh_rfc5114:2
+[ -f dhp.pem ] || $OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_prime_len:1024 -out dhp.pem
 
 # Now a DH private key
 $OPENSSL genpkey -paramfile dhp.pem -out dhskey.pem

diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index 7e01d8d27fd56ac472a2a6df528f776a9bc4e225..91089f3e8e44922a015d6612a7965e1fbb78d1da 100644 (file)
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -1,4 +1,4 @@
-
+/* ssl/ssl3.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,7 +388,6 @@ typedef struct ssl3_buffer_st
 #define TLS1_FLAGS_TLS_PADDING_BUG             0x0008
 #define TLS1_FLAGS_SKIP_CERT_VERIFY            0x0010
 #define TLS1_FLAGS_KEEP_HANDSHAKE              0x0020
-#define SSL3_FLAGS_CLEAR_CLIENT_CERT           0x0040
  
 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we
  * restart a handshake because of MS SGC and so prevents us