Commit 57559471 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

oops, revert unrelated changes

parent f4e11693

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

demos/certs/mkcerts.sh

+1 −4
Original line number Diff line number Diff line
@@ -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

ssl/ssl3.h

+1 −2
Original line number Diff line number Diff line 


/* 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