make update (f07cb1ce) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

TABLE

+62 −0

Original line number	Diff line number	Diff line
		@@ -1426,6 +1426,68 @@ $ranlib =
		$arflags =
		$multilib =

		*** debug-VC-WIN64A
		$cc = cl
		$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
		$unistd =
		$thread_cflag =
		$sys_id = WIN64A
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
		$cpuid_obj = x86_64cpuid.o
		$bn_obj = bn_asm.o x86_64-mont.o
		$des_obj =
		$aes_obj = aes-x86_64.o
		$bf_obj =
		$md5_obj = md5-x86_64.o
		$sha1_obj = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o
		$cast_obj =
		$rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj = cmll-x86_64.o cmll_misc.o
		$perlasm_scheme = auto
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		$shared_ldflag =
		$shared_extension =
		$ranlib =
		$arflags =
		$multilib =

		*** debug-VC-WIN64I
		$cc = cl
		$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
		$unistd =
		$thread_cflag =
		$sys_id = WIN64I
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN
		$cpuid_obj = ia64cpuid.o
		$bn_obj = ia64.o
		$des_obj =
		$aes_obj = aes_core.o aes_cbc.o aes-ia64.o
		$bf_obj =
		$md5_obj = md5-ia64.o
		$sha1_obj = sha1-ia64.o sha256-ia64.o sha512-ia64.o
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$perlasm_scheme = ias
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		$shared_ldflag =
		$shared_extension =
		$ranlib =
		$arflags =
		$multilib =

		*** debug-ben
		$cc = gcc
		$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG_UNUSED -O2 -pedantic -Wall -Wshadow -Werror -pipe

crypto/engine/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -109,8 +109,6 @@ eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
		eng_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		eng_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
		eng_cnf.o: ../cryptlib.h eng_cnf.c eng_int.h
		eng_cryptodev.o: ../../crypto/dh/dh.h ../../crypto/dsa/dsa.h
		eng_cryptodev.o: ../../crypto/err/err.h ../../crypto/rsa/rsa.h
		eng_cryptodev.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
		eng_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
		eng_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/stack/safestack.h

+25 −25

Original line number	Diff line number	Diff line
		@@ -2030,6 +2030,31 @@ 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))
		@@ -2080,31 +2105,6 @@ 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) \

test/Makefile

+10 −3

Original line number	Diff line number	Diff line
		@@ -594,9 +594,16 @@ ideatest.o: ../include/openssl/opensslconf.h ideatest.c
		igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h
		igetest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h
		igetest.o: ../include/openssl/rand.h igetest.c
		jpaketest.o: ../include/openssl/opensslconf.h jpaketest.c
		md2test.o: ../e_os.h ../include/openssl/e_os2.h
		md2test.o: ../include/openssl/opensslconf.h md2test.c
		jpaketest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
		jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
		jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
		jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
		jpaketest.o: ../include/openssl/symhacks.h jpaketest.c
		md2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
		md2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
		md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
		md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
		md2test.o: ../include/openssl/symhacks.h md2test.c
		md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
		md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
		md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h