(dd9d233e) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,10 @@

		Changes between 0.9.4 and 0.9.5 [xx XXX 1999]

		*) Clean up CRYPTO_EX_DATA functions, some of these didn't have prototypes
		used (char ) instead of (void ) and had casts all over the place.
		[Steve Henson]

		*) Make BN_generate_prime() return NULL on error if ret!=NULL.
		[Ulf Möller]

crypto/Makefile.ssl

+13 −7

Original line number	Diff line number	Diff line
		@@ -156,34 +156,40 @@ dclean:
		# DO NOT DELETE THIS LINE -- make depend depends on it.

		cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h
		cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/stack.h
		cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
		cpt_err.o: ../include/openssl/stack.h
		cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		cryptlib.o: ../include/openssl/stack.h cryptlib.h
		cryptlib.o: ../include/openssl/safestack.h ../include/openssl/stack.h
		cryptlib.o: cryptlib.h
		cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		cversion.o: ../include/openssl/stack.h buildinf.h cryptlib.h
		cversion.o: ../include/openssl/safestack.h ../include/openssl/stack.h
		cversion.o: buildinf.h cryptlib.h
		ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
		ex_data.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
		ex_data.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
		ex_data.o: ../include/openssl/stack.h cryptlib.h
		mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		mem.o: ../include/openssl/stack.h cryptlib.h
		mem.o: ../include/openssl/safestack.h ../include/openssl/stack.h cryptlib.h
		mem_dbg.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		mem_dbg.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		mem_dbg.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
		mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h
		mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
		mem_dbg.o: ../include/openssl/stack.h cryptlib.h
		tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
		tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
		tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
		tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		tmdiff.o: ../include/openssl/stack.h ../include/openssl/tmdiff.h cryptlib.h
		tmdiff.o: ../include/openssl/safestack.h ../include/openssl/stack.h
		tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h

crypto/asn1/Makefile.ssl

+2 −1

Original line number	Diff line number	Diff line
		@@ -853,7 +853,8 @@ t_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
		t_pkey.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
		t_pkey.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
		t_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
		t_pkey.o: ../../include/openssl/stack.h ../cryptlib.h
		t_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		t_pkey.o: ../cryptlib.h
		t_req.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		t_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		t_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

crypto/asn1/x_x509.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		#include <openssl/x509.h>

		static int x509_meth_num = 0;
		static STACK *x509_meth = NULL;
		static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;

		static ASN1_METHOD meth={
		(int (*)()) i2d_X509,
		@@ -122,7 +122,7 @@ X509 *X509_new(void)
		M_ASN1_New(ret->cert_info,X509_CINF_new);
		M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
		M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
		CRYPTO_new_ex_data(x509_meth, (char *)ret, &ret->ex_data);
		CRYPTO_new_ex_data(x509_meth, ret, &ret->ex_data);
		return(ret);
		M_ASN1_New_Error(ASN1_F_X509_NEW);
		}
		@@ -146,7 +146,7 @@ void X509_free(X509 *a)
		}
		#endif

		CRYPTO_free_ex_data(x509_meth,(char *)a,&a->ex_data);
		CRYPTO_free_ex_data(x509_meth,a,&a->ex_data);
		X509_CINF_free(a->cert_info);
		X509_ALGOR_free(a->sig_alg);
		M_ASN1_BIT_STRING_free(a->signature);
		@@ -156,20 +156,20 @@ void X509_free(X509 *a)
		Free((char *)a);
		}

		int X509_get_ex_new_index(long argl, char argp, int (new_func)(),
		int (dup_func)(), void (free_func)())
		int X509_get_ex_new_index(long argl, void argp, CRYPTO_EX_new new_func,
		CRYPTO_EX_dup dup_func, CRYPTO_EX_free free_func)
		{
		x509_meth_num++;
		return(CRYPTO_get_ex_new_index(x509_meth_num-1,
		&x509_meth,argl,argp,new_func,dup_func,free_func));
		}

		int X509_set_ex_data(X509 r, int idx, char arg)
		int X509_set_ex_data(X509 r, int idx, void arg)
		{
		return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
		}

		char X509_get_ex_data(X509 r, int idx)
		void X509_get_ex_data(X509 r, int idx)
		{
		return(CRYPTO_get_ex_data(&r->ex_data,idx));
		}

crypto/bio/Makefile.ssl

+28 −20

Original line number	Diff line number	Diff line
		@@ -90,17 +90,20 @@ b_dump.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		b_dump.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		b_dump.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		b_dump.o: ../../include/openssl/stack.h ../cryptlib.h
		b_dump.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		b_dump.o: ../cryptlib.h
		b_print.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		b_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		b_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		b_print.o: ../../include/openssl/stack.h ../cryptlib.h
		b_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		b_print.o: ../cryptlib.h
		b_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		b_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		b_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		b_sock.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		b_sock.o: ../../include/openssl/stack.h ../cryptlib.h
		b_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		b_sock.o: ../cryptlib.h
		bf_buff.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		bf_buff.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
		bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
		@@ -151,60 +154,65 @@ bio_cb.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bio_cb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		bio_cb.o: ../../include/openssl/stack.h ../cryptlib.h
		bio_cb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bio_cb.o: ../cryptlib.h
		bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
		bio_err.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h
		bio_err.o: ../../include/openssl/stack.h
		bio_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bio_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bio_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bio_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		bio_lib.o: ../../include/openssl/stack.h ../cryptlib.h
		bio_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bio_lib.o: ../cryptlib.h
		bss_acpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_acpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_acpt.o: ../../include/openssl/opensslconf.h
		bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
		bss_acpt.o: ../cryptlib.h
		bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
		bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h
		bss_bio.o: ../../include/openssl/stack.h
		bss_bio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_conn.o: ../../include/openssl/opensslconf.h
		bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
		bss_conn.o: ../cryptlib.h
		bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bss_conn.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_fd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_fd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_fd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		bss_fd.o: ../../include/openssl/stack.h ../cryptlib.h bss_sock.c
		bss_fd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bss_fd.o: ../cryptlib.h bss_sock.c
		bss_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_file.o: ../../include/openssl/opensslconf.h
		bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
		bss_file.o: ../cryptlib.h
		bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bss_file.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_log.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_log.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_log.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		bss_log.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_log.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bss_log.o: ../cryptlib.h
		bss_mem.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_mem.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_mem.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		bss_mem.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		bss_mem.o: ../cryptlib.h
		bss_null.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_null.o: ../../include/openssl/opensslconf.h
		bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
		bss_null.o: ../cryptlib.h
		bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bss_null.o: ../../include/openssl/stack.h ../cryptlib.h
		bss_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		bss_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
		bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bss_sock.o: ../../include/openssl/opensslconf.h
		bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
		bss_sock.o: ../cryptlib.h
		bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bss_sock.o: ../../include/openssl/stack.h ../cryptlib.h