make update (031c7890) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

crypto/cms/Makefile

+18 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,24 @@ cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
		cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
		cms_lib.o: cms_lcl.h cms_lib.c
		cms_pwri.o: ../../e_os.h ../../include/openssl/aes.h
		cms_pwri.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
		cms_pwri.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		cms_pwri.o: ../../include/openssl/cms.h ../../include/openssl/conf.h
		cms_pwri.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
		cms_pwri.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
		cms_pwri.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
		cms_pwri.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
		cms_pwri.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
		cms_pwri.o: ../../include/openssl/opensslconf.h
		cms_pwri.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		cms_pwri.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
		cms_pwri.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
		cms_pwri.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
		cms_pwri.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		cms_pwri.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
		cms_pwri.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h
		cms_pwri.o: cms_lcl.h cms_pwri.c
		cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h
		cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
		cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h

crypto/evp/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
		evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
		evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
		evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c
		evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h evp_pbe.c
		evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
		evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
		@@ -601,7 +601,8 @@ p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
		p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
		p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
		p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt2.c
		p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
		p5_crpt2.o: p5_crpt2.c
		p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
		p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

crypto/stack/safestack.h

+25 −25

Original line number	Diff line number	Diff line
		@@ -2030,31 +2030,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
		#define sk_void_sort(st) SKM_sk_sort(void, (st))
		#define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))

		#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
		#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
		#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
		#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
		#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
		#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
		#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING )sk_delete_ptr((_STACK )CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
		#define sk_OPENSSL_STRING_set_cmp_func(st, cmp) \
		((int ()(const char const ,const char const *)) \
		sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
		#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_pop(st) (char )sk_pop((_STACK )CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
		#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))


		#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
		#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
		#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
		@@ -2105,6 +2080,31 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
		#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))


		#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
		#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
		#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
		#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
		#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
		#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
		#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
		#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING )sk_delete_ptr((_STACK )CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
		#define sk_OPENSSL_STRING_set_cmp_func(st, cmp) \
		((int ()(const char const ,const char const *)) \
		sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
		#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
		#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_pop(st) (char )sk_pop((_STACK )CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
		#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
		#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))


		#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
		SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
		#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \

ssl/Makefile

+34 −14

Original line number	Diff line number	Diff line
		@@ -609,13 +609,14 @@ s3_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
		s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
		s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
		s3_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h
		s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
		s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
		s3_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
		s3_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
		s3_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
		s3_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
		s3_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_pkt.c
		s3_pkt.o: ssl_locl.h
		s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
		s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
		@@ -887,13 +888,13 @@ t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
		t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
		t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
		t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
		t1_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
		t1_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
		t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
		t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
		t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
		t1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
		t1_enc.o: t1_enc.c
		t1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h
		t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		t1_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		t1_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		t1_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		t1_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		t1_enc.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_enc.c
		t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		t1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
		t1_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h
		@@ -934,6 +935,25 @@ t1_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		t1_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		t1_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		t1_meth.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_meth.c
		t1_reneg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		t1_reneg.o: ../include/openssl/buffer.h ../include/openssl/comp.h
		t1_reneg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
		t1_reneg.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
		t1_reneg.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
		t1_reneg.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
		t1_reneg.o: ../include/openssl/evp.h ../include/openssl/hmac.h
		t1_reneg.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
		t1_reneg.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		t1_reneg.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		t1_reneg.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
		t1_reneg.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
		t1_reneg.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
		t1_reneg.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		t1_reneg.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
		t1_reneg.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
		t1_reneg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		t1_reneg.o: ../include/openssl/tls1.h ../include/openssl/x509.h
		t1_reneg.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_reneg.c
		t1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		t1_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
		t1_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h

util/ssleay.num

+3 −0

Original line number	Diff line number	Diff line
		@@ -259,3 +259,6 @@ SSL_set_session_secret_cb 307 EXIST::FUNCTION:
		SSL_set_session_ticket_ext_cb 308 EXIST::FUNCTION:
		SSL_set1_param 309 EXIST::FUNCTION:
		SSL_CTX_set1_param 310 EXIST::FUNCTION:
		TLSv1_1_method 311 EXIST::FUNCTION:
		TLSv1_1_client_method 312 EXIST::FUNCTION:
		TLSv1_1_server_method 313 EXIST::FUNCTION: