From: Richard Levitte Date: Thu, 26 Jun 2003 10:27:11 +0000 (+0000) Subject: make update X-Git-Tag: BEN_FIPS_TEST_1~38^2~30 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c89f31def0c5ae23ae0d1ba429ec8ce7a9ffbb33;p=oweals%2Fopenssl.git make update --- diff --git a/TABLE b/TABLE index 0ad0fcaf91..796a0094bc 100644 --- a/TABLE +++ b/TABLE @@ -1652,7 +1652,7 @@ $arflags = *** debug-levitte-linux-elf $cc = gcc -$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe +$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1677,7 +1677,7 @@ $arflags = *** debug-levitte-linux-elf-extreme $cc = gcc -$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe +$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1702,7 +1702,7 @@ $arflags = *** debug-levitte-linux-noasm $cc = gcc -$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe +$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1727,7 +1727,7 @@ $arflags = *** debug-levitte-linux-noasm-extreme $cc = gcc -$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe +$cflags = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1752,7 +1752,7 @@ $arflags = *** debug-linux-elf $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -m486 -Wall +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1777,7 +1777,7 @@ $arflags = *** debug-linux-elf-noefence $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -m486 -Wall +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1802,7 +1802,7 @@ $arflags = *** debug-linux-pentium $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1827,7 +1827,7 @@ $arflags = *** debug-linux-ppro $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1952,7 +1952,7 @@ $arflags = *** debug-solaris-sparcv9-gcc $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W $unistd = $thread_cflag = -D_REENTRANT $sys_id = ULTRASPARC @@ -2927,7 +2927,7 @@ $arflags = *** linux-aout $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall $unistd = $thread_cflag = (unknown) $sys_id = @@ -2952,7 +2952,7 @@ $arflags = *** linux-elf $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -2977,7 +2977,7 @@ $arflags = *** linux-elf-arm $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3002,7 +3002,7 @@ $arflags = *** linux-ia32-icc $cc = icc -$cflags = -DL_ENDIAN -O2 +$cflags = -DL_ENDIAN -DTERMIO -O2 $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3027,7 +3027,7 @@ $arflags = *** linux-ia64 $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3052,7 +3052,7 @@ $arflags = *** linux-ia64-ecc $cc = ecc -$cflags = -DL_ENDIAN -O2 -Wall +$cflags = -DL_ENDIAN -DTERMIO -O2 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3077,7 +3077,7 @@ $arflags = *** linux-k6 $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -mcpu=k6 -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3102,7 +3102,7 @@ $arflags = *** linux-m68k $cc = gcc -$cflags = -DB_ENDIAN -O2 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3127,7 +3127,7 @@ $arflags = *** linux-mips $cc = gcc -$cflags = -DB_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3152,7 +3152,7 @@ $arflags = *** linux-mipsel $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3177,7 +3177,7 @@ $arflags = *** linux-parisc $cc = gcc -$cflags = -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W +$cflags = -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3202,7 +3202,7 @@ $arflags = *** linux-pentium $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -mcpu=pentium -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentium -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3227,7 +3227,7 @@ $arflags = *** linux-ppc $cc = gcc -$cflags = -DB_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3252,7 +3252,7 @@ $arflags = *** linux-ppro $cc = gcc -$cflags = -DL_ENDIAN -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall +$cflags = -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3277,7 +3277,7 @@ $arflags = *** linux-s390 $cc = gcc -$cflags = -DB_ENDIAN -DNO_ASM -O3 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3302,7 +3302,7 @@ $arflags = *** linux-s390x $cc = gcc -$cflags = -DB_ENDIAN -DNO_ASM -O3 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3327,7 +3327,7 @@ $arflags = *** linux-sparcv7 $cc = gcc -$cflags = -DB_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3352,7 +3352,7 @@ $arflags = *** linux-sparcv8 $cc = gcc -$cflags = -mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W +$cflags = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3377,7 +3377,7 @@ $arflags = *** linux-sparcv9 $cc = gcc -$cflags = -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W +$cflags = -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W $unistd = $thread_cflag = -D_REENTRANT $sys_id = ULTRASPARC @@ -3402,7 +3402,7 @@ $arflags = *** linux-x86_64 $cc = gcc -$cflags = -m64 -DL_ENDIAN -O3 -Wall -DMD32_REG_T=int +$cflags = -m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -3427,7 +3427,7 @@ $arflags = *** linux64-sparcv9 $cc = gcc -$cflags = -m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall +$cflags = -m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = ULTRASPARC diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index c16ff85819..7a187aff6d 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -3333,8 +3333,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[434]),/* OBJ_data 0 9 */ &(nid_objs[181]),/* OBJ_iso 1 */ &(nid_objs[182]),/* OBJ_member_body 1 2 */ -&(nid_objs[527]),/* OBJ_identified_organization 1 3 */ &(nid_objs[379]),/* OBJ_org 1 3 */ +&(nid_objs[527]),/* OBJ_identified_organization 1 3 */ &(nid_objs[393]),/* OBJ_joint_iso_ccitt 2 */ &(nid_objs[11]),/* OBJ_X500 2 5 */ &(nid_objs[380]),/* OBJ_dod 1 3 6 */ diff --git a/util/libeay.num b/util/libeay.num index aee8b4215b..fa11a9fa6f 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -3093,7 +3093,7 @@ ENGINE_register_all_STORE 3522 EXIST::FUNCTION:ENGINE STORE_ATTR_INFO_modify_cstr 3523 EXIST::FUNCTION: STORE_generate_crl 3524 EXIST::FUNCTION: STORE_store_public_key 3525 EXIST::FUNCTION: -STORE_Directory 3526 EXIST::FUNCTION: +STORE_Directory 3526 NOEXIST::FUNCTION: STORE_revoke_private_key 3527 EXIST::FUNCTION: STORE_ATTR_INFO_modify_dn 3528 EXIST::FUNCTION: STORE_method_get_initialise_function 3529 EXIST::FUNCTION: @@ -3117,7 +3117,7 @@ STORE_OBJECT_free 3546 EXIST::FUNCTION: STORE_ATTR_INFO_get0_sha1str 3547 EXIST::FUNCTION: STORE_ATTR_INFO_get0_cstr 3548 EXIST::FUNCTION: STORE_get_ex_new_index 3549 EXIST::FUNCTION: -STORE_File 3550 EXIST::FUNCTION: +STORE_File 3550 NOEXIST::FUNCTION: ENGINE_get_STORE 3551 EXIST::FUNCTION:ENGINE STORE_get_certificate 3552 EXIST::FUNCTION: STORE_delete_certificate 3553 EXIST::FUNCTION: