From f944e7845c18ed600b3b39dbdd450317aa19b21f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 24 Jul 2000 10:02:47 +0000 Subject: [PATCH] "make update" --- TABLE | 220 ++++++++++++++++++++++++++++++++++++++- crypto/objects/obj_dat.h | 22 ++-- crypto/rand/Makefile.ssl | 9 +- crypto/stack/safestack.h | 20 ---- util/libeay.num | 5 + 5 files changed, 243 insertions(+), 33 deletions(-) diff --git a/TABLE b/TABLE index 79333d356f..0026a900a1 100644 --- a/TABLE +++ b/TABLE @@ -17,6 +17,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** BC-32 $cc = bcc32 @@ -35,6 +37,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** BS2000-OSD $cc = c89 @@ -53,6 +57,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** CygWin32 $cc = gcc @@ -71,6 +77,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** FreeBSD $cc = gcc @@ -89,6 +97,8 @@ $rc4_obj = asm/rx86-out.o $rmd160_obj = asm/rm86-out.o $rc5_obj = asm/r586-out.o $dso_scheme = +$shared_target= +$shared_cflag = *** FreeBSD-alpha $cc = gcc @@ -107,6 +117,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** FreeBSD-elf $cc = gcc @@ -125,6 +137,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** Mingw32 $cc = gcc @@ -143,6 +157,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** NetBSD-m68 $cc = gcc @@ -161,6 +177,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** NetBSD-sparc $cc = gcc @@ -179,6 +197,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** NetBSD-x86 $cc = gcc @@ -197,6 +217,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** OpenBSD $cc = gcc @@ -215,6 +237,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** OpenBSD-alpha $cc = gcc @@ -233,6 +257,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** OpenBSD-mips $cc = gcc @@ -251,6 +277,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** OpenBSD-x86 $cc = gcc @@ -269,6 +297,8 @@ $rc4_obj = asm/rx86-out.o $rmd160_obj = asm/rm86-out.o $rc5_obj = asm/r586-out.o $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** ReliantUNIX $cc = cc @@ -287,6 +317,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** SINIX $cc = cc @@ -305,6 +337,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** SINIX-N $cc = /usr/ucb/cc @@ -323,6 +357,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-MSDOS $cc = cl @@ -341,6 +377,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-NT $cc = cl @@ -359,6 +397,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-W31-16 $cc = cl @@ -377,6 +417,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-W31-32 $cc = cl @@ -395,6 +437,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-WIN16 $cc = cl @@ -413,6 +457,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** VC-WIN32 $cc = cl @@ -431,6 +477,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** aix-cc $cc = cc @@ -449,6 +497,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** aix-gcc $cc = gcc @@ -467,6 +517,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** alpha-cc $cc = cc @@ -485,6 +537,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** alpha-gcc $cc = gcc @@ -503,6 +557,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** alpha164-cc $cc = cc @@ -520,7 +576,9 @@ $cast_obj = $rc4_obj = $rmd160_obj = $rc5_obj = -$dso_scheme = +$dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** bsdi-elf-gcc $cc = gcc @@ -539,6 +597,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** bsdi-gcc $cc = gcc @@ -557,6 +617,8 @@ $rc4_obj = asm/rx86bsdi.o $rmd160_obj = asm/rm86bsdi.o $rc5_obj = asm/r586bsdi.o $dso_scheme = +$shared_target= +$shared_cflag = *** cc $cc = cc @@ -575,6 +637,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** cray-t3e $cc = cc @@ -593,6 +657,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** cray-t90-cc $cc = cc @@ -611,6 +677,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** debug $cc = gcc @@ -629,6 +697,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** debug-ben $cc = gcc @@ -647,6 +717,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** debug-ben-debug $cc = gcc @@ -665,6 +737,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** debug-ben-strict $cc = gcc @@ -683,6 +757,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** debug-bodo $cc = gcc @@ -701,6 +777,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** debug-levitte-linux-elf $cc = gcc @@ -719,6 +797,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-linux-elf $cc = gcc @@ -737,6 +817,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-linux-elf-noefence $cc = gcc @@ -755,6 +837,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-rse $cc = cc @@ -773,6 +857,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** debug-solaris-sparcv8-cc $cc = cc @@ -791,6 +877,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-solaris-sparcv8-gcc $cc = gcc @@ -809,6 +897,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-solaris-sparcv9-cc $cc = cc @@ -827,6 +917,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-solaris-sparcv9-gcc $cc = gcc @@ -845,6 +937,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** debug-steve $cc = gcc @@ -863,6 +957,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** debug-ulf $cc = gcc @@ -881,6 +977,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** dgux-R3-gcc $cc = gcc @@ -899,6 +997,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** dgux-R4-gcc $cc = gcc @@ -917,6 +1017,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** dgux-R4-x86-gcc $cc = gcc @@ -935,6 +1037,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = +$shared_target= +$shared_cflag = *** dist $cc = cc @@ -953,6 +1057,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** gcc $cc = gcc @@ -971,6 +1077,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** hpux-brokencc $cc = cc @@ -989,6 +1097,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-brokengcc $cc = gcc @@ -1007,6 +1117,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-cc $cc = cc @@ -1025,6 +1137,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-gcc $cc = gcc @@ -1043,6 +1157,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-parisc-cc $cc = cc @@ -1061,6 +1177,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-parisc-cc-o4 $cc = cc @@ -1079,6 +1197,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux-parisc-gcc $cc = gcc @@ -1097,6 +1217,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux10-brokencc $cc = cc @@ -1115,6 +1237,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux10-brokengcc $cc = gcc @@ -1133,6 +1257,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux10-cc $cc = cc @@ -1151,6 +1277,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux10-gcc $cc = gcc @@ -1169,6 +1297,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** hpux64-parisc-cc $cc = cc @@ -1187,6 +1317,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dl +$shared_target= +$shared_cflag = *** irix-cc $cc = cc @@ -1205,6 +1337,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** irix-gcc $cc = gcc @@ -1223,6 +1357,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** irix-mips3-cc $cc = cc @@ -1241,6 +1377,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** irix-mips3-gcc $cc = gcc @@ -1259,6 +1397,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** irix64-mips4-cc $cc = cc @@ -1277,6 +1417,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** irix64-mips4-gcc $cc = gcc @@ -1295,6 +1437,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-alpha+bwx-ccc $cc = ccc @@ -1313,6 +1457,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-alpha+bwx-gcc $cc = gcc @@ -1331,6 +1477,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-alpha-ccc $cc = ccc @@ -1349,6 +1497,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-alpha-gcc $cc = gcc @@ -1367,6 +1517,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-aout $cc = gcc @@ -1385,6 +1537,8 @@ $rc4_obj = asm/rx86-out.o $rmd160_obj = asm/rm86-out.o $rc5_obj = asm/r586-out.o $dso_scheme = +$shared_target= +$shared_cflag = *** linux-elf $cc = gcc @@ -1403,6 +1557,8 @@ $rc4_obj = asm/rx86-elf.o $rmd160_obj = asm/rm86-elf.o $rc5_obj = asm/r586-elf.o $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** linux-elf-arm $cc = gcc @@ -1421,6 +1577,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** linux-ia64 $cc = gcc @@ -1439,6 +1597,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-m68k $cc = gcc @@ -1457,6 +1617,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-mips $cc = gcc @@ -1475,6 +1637,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-ppc $cc = gcc @@ -1493,6 +1657,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-sparcv7 $cc = gcc @@ -1511,6 +1677,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-sparcv8 $cc = gcc @@ -1529,6 +1697,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** linux-sparcv9 $cc = gcc @@ -1547,6 +1717,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** ncr-scde $cc = cc @@ -1565,6 +1737,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** nextstep $cc = cc @@ -1583,6 +1757,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** nextstep3.3 $cc = cc @@ -1601,6 +1777,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** purify $cc = purify gcc @@ -1619,6 +1797,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** rhapsody-ppc-cc $cc = cc @@ -1637,6 +1817,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** sco5-cc $cc = cc @@ -1655,6 +1837,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** sco5-gcc $cc = gcc @@ -1673,6 +1857,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** solaris-sparc-sc3 $cc = cc @@ -1691,6 +1877,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv7-cc $cc = cc @@ -1709,6 +1897,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv7-gcc $cc = gcc @@ -1727,6 +1917,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv8-cc $cc = cc @@ -1745,6 +1937,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv8-gcc $cc = gcc @@ -1763,6 +1957,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv9-cc $cc = cc @@ -1781,6 +1977,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv9-gcc $cc = gcc @@ -1799,6 +1997,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-sparcv9-gcc27 $cc = gcc @@ -1817,6 +2017,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris-x86-gcc $cc = gcc @@ -1835,6 +2037,8 @@ $rc4_obj = asm/rx86-sol.o $rmd160_obj = asm/rm86-sol.o $rc5_obj = asm/r586-sol.o $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** solaris64-sparcv9-cc $cc = cc @@ -1853,6 +2057,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = dlfcn +$shared_target= +$shared_cflag = *** sunos-gcc $cc = gcc @@ -1871,6 +2077,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** ultrix-cc $cc = cc @@ -1889,6 +2097,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** ultrix-gcc $cc = gcc @@ -1907,6 +2117,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** unixware-2.0 $cc = cc @@ -1925,6 +2137,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** unixware-2.0-pentium $cc = cc @@ -1943,6 +2157,8 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = *** unixware-7 $cc = cc @@ -1961,3 +2177,5 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $dso_scheme = +$shared_target= +$shared_cflag = diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 39c87e43bc..afee370f34 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1807,17 +1807,17 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[320]),/* OBJ_id_regCtrl_protocolEncrKey 1 3 6 1 5 5 7 5 1 6 */ &(nid_objs[321]),/* OBJ_id_regInfo_utf8Pairs 1 3 6 1 5 5 7 5 2 1 */ &(nid_objs[322]),/* OBJ_id_regInfo_certReq 1 3 6 1 5 5 7 5 2 2 */ -&(nid_objs[365]),/* OBJ_id_pkix_OCSP_basic 1 3 6 1 5 5 7 48 1 1 */ -&(nid_objs[366]),/* OBJ_id_pkix_OCSP_Nonce 1 3 6 1 5 5 7 48 1 2 */ -&(nid_objs[367]),/* OBJ_id_pkix_OCSP_CrlID 1 3 6 1 5 5 7 48 1 3 */ -&(nid_objs[368]),/* OBJ_id_pkix_OCSP_acceptableResponses 1 3 6 1 5 5 7 48 1 4 */ -&(nid_objs[369]),/* OBJ_id_pkix_OCSP_noCheck 1 3 6 1 5 5 7 48 1 5 */ -&(nid_objs[370]),/* OBJ_id_pkix_OCSP_archiveCutoff 1 3 6 1 5 5 7 48 1 6 */ -&(nid_objs[371]),/* OBJ_id_pkix_OCSP_serviceLocator 1 3 6 1 5 5 7 48 1 7 */ -&(nid_objs[372]),/* OBJ_id_pkix_OCSP_extendedStatus 1 3 6 1 5 5 7 48 1 8 */ -&(nid_objs[373]),/* OBJ_id_pkix_OCSP_valid 1 3 6 1 5 5 7 48 1 9 */ -&(nid_objs[374]),/* OBJ_id_pkix_OCSP_path 1 3 6 1 5 5 7 48 1 10 */ -&(nid_objs[375]),/* OBJ_id_pkix_OCSP_trustRoot 1 3 6 1 5 5 7 48 1 11 */ +&(nid_objs[365]),/* OBJ_id_pkix_OCSP_basic 1 3 6 1 5 5 7 48 1 1 */ +&(nid_objs[366]),/* OBJ_id_pkix_OCSP_Nonce 1 3 6 1 5 5 7 48 1 2 */ +&(nid_objs[367]),/* OBJ_id_pkix_OCSP_CrlID 1 3 6 1 5 5 7 48 1 3 */ +&(nid_objs[368]),/* OBJ_id_pkix_OCSP_acceptableResponses 1 3 6 1 5 5 7 48 1 4 */ +&(nid_objs[369]),/* OBJ_id_pkix_OCSP_noCheck 1 3 6 1 5 5 7 48 1 5 */ +&(nid_objs[370]),/* OBJ_id_pkix_OCSP_archiveCutoff 1 3 6 1 5 5 7 48 1 6 */ +&(nid_objs[371]),/* OBJ_id_pkix_OCSP_serviceLocator 1 3 6 1 5 5 7 48 1 7 */ +&(nid_objs[372]),/* OBJ_id_pkix_OCSP_extendedStatus 1 3 6 1 5 5 7 48 1 8 */ +&(nid_objs[373]),/* OBJ_id_pkix_OCSP_valid 1 3 6 1 5 5 7 48 1 9 */ +&(nid_objs[374]),/* OBJ_id_pkix_OCSP_path 1 3 6 1 5 5 7 48 1 10 */ +&(nid_objs[375]),/* OBJ_id_pkix_OCSP_trustRoot 1 3 6 1 5 5 7 48 1 11 */ &(nid_objs[71]),/* OBJ_netscape_cert_type 2 16 840 1 113730 1 1 */ &(nid_objs[72]),/* OBJ_netscape_base_url 2 16 840 1 113730 1 2 */ &(nid_objs[73]),/* OBJ_netscape_revocation_url 2 16 840 1 113730 1 3 */ diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl index 48a01a317b..90be367d73 100644 --- a/crypto/rand/Makefile.ssl +++ b/crypto/rand/Makefile.ssl @@ -83,13 +83,20 @@ md_rand.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h md_rand.o: ../../include/openssl/err.h ../../include/openssl/lhash.h md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h -md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h rand_lcl.h rand_egd.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h rand_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h rand_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h rand_lib.o: ../../include/openssl/rand.h +rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h +rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h +rand_win.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h +rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +rand_win.o: ../../include/openssl/stack.h ../cryptlib.h rand_lcl.h randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index 6d5a4cc09a..f22c1f9fb3 100644 --- a/crypto/stack/safestack.h +++ b/crypto/stack/safestack.h @@ -664,26 +664,6 @@ STACK_OF(type) \ #define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st)) #define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st)) -#define sk_UI_STRING_new(st) SKM_sk_new(UI_STRING, (st)) -#define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING) -#define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st)) -#define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st)) -#define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i)) -#define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val)) -#define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st)) -#define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val)) -#define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val)) -#define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val)) -#define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i)) -#define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr)) -#define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i)) -#define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp)) -#define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st) -#define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func)) -#define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st)) -#define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st)) -#define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st)) - #define sk_X509_new(st) SKM_sk_new(X509, (st)) #define sk_X509_new_null() SKM_sk_new_null(X509) #define sk_X509_free(st) SKM_sk_free(X509, (st)) diff --git a/util/libeay.num b/util/libeay.num index 2db0f57b8d..ffcbbe4942 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1821,3 +1821,8 @@ CRYPTO_get_dynlock_lock_callback 2417 CRYPTO_get_dynlock_destroy_callback 2418 CRYPTO_get_dynlock_value 2419 CRYPTO_get_dynlock_create_callback 2420 +c2i_ASN1_BIT_STRING 2421 +i2c_ASN1_BIT_STRING 2422 +RAND_poll 2423 +c2i_ASN1_INTEGER 2424 +i2c_ASN1_INTEGER 2425 -- 2.25.1