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

Update from 1.0.0-stable.

parent d76b8c89

apps/apps.h

+8 −2
Original line number Diff line number Diff line
@@ -168,6 +168,12 @@ extern BIO *bio_err; 
#define do_pipe_sig()

#endif



#ifdef OPENSSL_NO_COMP

#define zlib_cleanup() 

#else

#define zlib_cleanup() COMP_zlib_cleanup()

#endif



#if defined(MONOLITH) && !defined(OPENSSL_C)

#  define apps_startup() \

		do_pipe_sig()
@@ -182,7 +188,7 @@ extern BIO *bio_err; 
			do { CONF_modules_unload(1); destroy_ui_method(); \

			OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \

			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \

			ERR_free_strings(); COMP_zlib_cleanup();} while(0)

			ERR_free_strings(); zlib_cleanup();} while(0)

#  else

#    define apps_startup() \

			do { do_pipe_sig(); CRYPTO_malloc_init(); \
@@ -192,7 +198,7 @@ extern BIO *bio_err; 
			do { CONF_modules_unload(1); destroy_ui_method(); \

			OBJ_cleanup(); EVP_cleanup(); \

			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \

			ERR_free_strings(); } while(0)

			ERR_free_strings(); zlib_cleanup(); } while(0)

#  endif

#endif

crypto/pkcs12/pkcs12.h

+3 −0
Original line number Diff line number Diff line
@@ -230,8 +230,11 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, 
		   const EVP_MD *md_type);

int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,

					 int saltlen, const EVP_MD *md_type);

<<<<<<< pkcs12.h

=======

unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);

char *OPENSSL_uni2asc(unsigned char *uni, int unilen);

>>>>>>> 1.44



DECLARE_ASN1_FUNCTIONS(PKCS12)

DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)

ssl/s23_clnt.c

+4 −1
Original line number Diff line number Diff line
@@ -269,11 +269,14 @@ static int ssl23_client_hello(SSL *s) 
	{

	unsigned char *buf;

	unsigned char *p,*d;

	int i,j,ch_len;

	int i,ch_len;

	unsigned long Time,l;

	int ssl2_compat;

	int version = 0, version_major, version_minor;

#ifndef OPENSSL_NO_COMP

	int j;

	SSL_COMP *comp;

#endif

	int ret;



	ssl2_compat = (s->options & SSL_OP_NO_SSLv2) ? 0 : 1;

ssl/ssl_asn1.c

+2 −1
Original line number Diff line number Diff line
@@ -120,13 +120,14 @@ 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,v7=0,v8=0;

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

	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

#ifndef OPENSSL_NO_COMP

	unsigned char cbuf;

	int v11=0;

#endif

	long l;