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

Fix warning and make no-tlsext work.

parent 34449617

apps/s_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -649,5 +649,5 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type, 
			client_server ? "server": "client",

			extname, type, len);

	BIO_dump(bio, (char *)data, len);

	BIO_flush(bio);

	(void)BIO_flush(bio);

	}

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2632,8 +2632,8 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, 
	SSL_CIPHER *c,*ret=NULL;

	STACK_OF(SSL_CIPHER) *prio, *allow;

	int i,ii,ok;

	unsigned int j;

#ifndef OPENSSL_NO_TLSEXT

	unsigned int j;

#ifndef OPENSSL_NO_EC

	int ec_ok, ec_nid;

	unsigned char ec_search1 = 0, ec_search2 = 0;

ssl/ssl_asn1.c

+4 −1
Original line number Diff line number Diff line
@@ -118,10 +118,13 @@ typedef struct ssl_session_asn1_st 
int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)

	{

#define LSIZE2 (sizeof(long)*2)

	int v1=0,v2=0,v3=0,v4=0,v5=0,v6=0,v7=0,v8=0,v9=0,v10=0;

	int v1=0,v2=0,v3=0,v4=0,v5=0,v7=0,v8=0;

	unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2];

	unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2],ibuf5[LSIZE2];

#ifndef OPENSSL_NO_TLSEXT

	int v6=0,v9=0,v10=0;

	unsigned char ibuf6[LSIZE2];

#endif

	long l;

	SSL_SESSION_ASN1 a;

	M_ASN1_I2D_vars(in);

ssl/ssl_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -2573,8 +2573,10 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx) 
	{

	if (ssl->ctx == ctx)

		return ssl->ctx;

#ifndef OPENSSL_NO_TLSEXT

	if (ctx == NULL)

		ctx = ssl->initial_ctx;

#endif

	if (ssl->cert != NULL)

		ssl_cert_free(ssl->cert);

	ssl->cert = ssl_cert_dup(ctx->cert);

ssl/ssl_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ int ssl_check_clienthello_tlsext(SSL *s); 
int ssl_check_serverhello_tlsext(SSL *s);

int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,

				const unsigned char *limit, SSL_SESSION **ret);

#endif

EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ;

void ssl_clear_hash_ctx(EVP_MD_CTX **hash);

#endif
 
#endif