diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2012-02-09 15:43:58 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2012-02-09 15:43:58 +0000 |
commit | 57559471bfeaac8bf37d805f913c7a2d003df333 (patch) | |
tree | 9a29557d5876dfde22fb7ae0c413d103e2d38a3e | |
parent | f4e1169341ad1217e670387db5b0c12d680f95f4 (diff) |
oops, revert unrelated changes
-rw-r--r-- | apps/s_client.c | 2 | ||||
-rw-r--r-- | demos/certs/mkcerts.sh | 5 | ||||
-rw-r--r-- | ssl/ssl3.h | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index d7249814ac..dbc0700ded 100644 --- 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 2cf39482c7..0d55e8f846 100644 --- 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 7e01d8d27f..91089f3e8e 100644 --- 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 |