Make room for Camellia assembler. (6a8517f2) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+45 −36

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.org

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ MD5_ASM_OBJ=
		SHA1_ASM_OBJ=
		RMD160_ASM_OBJ=
		WP_ASM_OBJ=
		CMLL_ENC=

		# KRB5 stuff
		KRB5_INCLUDES=

TABLE

+161 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -48,6 +49,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -76,6 +78,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -104,6 +107,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -132,6 +136,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -160,6 +165,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -188,6 +194,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -216,6 +223,7 @@ $rc4_obj = rx86-out.o
		$rmd160_obj = rm86-out.o
		$rc5_obj = r586-out.o
		$wp_obj = wp_block.o w86mmx-out.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-shared
		$shared_cflag = -fPIC
		@@ -244,6 +252,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-shared
		$shared_cflag = -fPIC
		@@ -272,6 +281,7 @@ $rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -300,6 +310,7 @@ $rc4_obj = rx86-cof.o
		$rmd160_obj = rm86-cof.o
		$rc5_obj = r586-cof.o
		$wp_obj = wp_block.o w86mmx-cof.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= cygwin-shared
		$shared_cflag = -D_WINDLL
		@@ -328,6 +339,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -356,6 +368,7 @@ $rc4_obj = rx86-out.o
		$rmd160_obj = rm86-out.o
		$rc5_obj = r586-out.o
		$wp_obj = wp_block.o w86mmx-out.o
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -384,6 +397,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -412,6 +426,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -440,6 +455,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -468,6 +484,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= reliantunix-shared
		$shared_cflag =
		@@ -496,6 +513,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -524,6 +542,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -552,6 +571,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -580,6 +600,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -608,6 +629,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -636,6 +658,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -664,6 +687,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -692,6 +716,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		@@ -720,6 +745,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= aix-shared
		$shared_cflag =
		@@ -748,6 +774,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= aix-shared
		$shared_cflag =
		@@ -776,6 +803,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -804,6 +832,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= aix-shared
		$shared_cflag =
		@@ -832,6 +861,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= aix-shared
		$shared_cflag =
		@@ -860,6 +890,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -888,6 +919,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = beos
		$shared_target= beos-shared
		$shared_cflag = -fPIC
		@@ -916,6 +948,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = beos
		$shared_target= beos-shared
		$shared_cflag = -fPIC -DPIC
		@@ -944,6 +977,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-gcc-shared
		$shared_cflag = -fPIC
		@@ -972,6 +1006,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1000,6 +1035,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1028,6 +1064,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1056,6 +1093,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= darwin-shared
		$shared_cflag = -fPIC -fno-common
		@@ -1084,6 +1122,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= darwin-shared
		$shared_cflag = -fPIC -fno-common
		@@ -1112,6 +1151,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= darwin-shared
		$shared_cflag = -fPIC -fno-common
		@@ -1140,6 +1180,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1168,6 +1209,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= bsd-shared
		$shared_cflag = -fPIC
		@@ -1196,6 +1238,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= cygwin-shared
		$shared_cflag = -D_WINDLL
		@@ -1224,6 +1267,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1252,6 +1296,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1280,6 +1325,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1308,6 +1354,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1336,6 +1383,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1364,6 +1412,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1392,6 +1441,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= darwin-shared
		$shared_cflag = -fPIC
		@@ -1420,6 +1470,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1448,6 +1499,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1476,6 +1528,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1504,6 +1557,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1532,6 +1586,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1560,6 +1615,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1588,6 +1644,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1616,6 +1673,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -1644,6 +1702,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target=
		$shared_cflag =
		@@ -1672,6 +1731,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target=
		$shared_cflag =
		@@ -1700,6 +1760,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1718,7 +1779,7 @@ $lflags = -lsocket -lnsl -ldl
		$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR
		$cpuid_obj =
		$bn_obj = sparcv8.o
		$des_obj =
		$des_obj = des_enc-sparc.o fcrypt_b.o
		$aes_obj =
		$bf_obj =
		$md5_obj =
		@@ -1728,6 +1789,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -1746,7 +1808,7 @@ $lflags = -lsocket -lnsl -ldl
		$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR
		$cpuid_obj =
		$bn_obj = sparcv8.o
		$des_obj =
		$des_obj = des_enc-sparc.o fcrypt_b.o
		$aes_obj =
		$bf_obj =
		$md5_obj =
		@@ -1756,6 +1818,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -1784,6 +1847,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -1812,6 +1876,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -1840,6 +1905,7 @@ $rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag =
		@@ -1868,6 +1934,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag =
		@@ -1896,6 +1963,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag =
		@@ -1924,6 +1992,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = win32
		$shared_target= cygwin-shared
		$shared_cflag =
		@@ -1952,6 +2021,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -1980,6 +2050,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2008,6 +2079,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2036,6 +2108,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2064,6 +2137,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2092,6 +2166,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2120,6 +2195,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2148,6 +2224,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = -fPIC
		@@ -2176,6 +2253,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2204,6 +2282,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = -fpic
		@@ -2232,6 +2311,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2260,6 +2340,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2288,6 +2369,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = -fPIC
		@@ -2316,6 +2398,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2344,6 +2427,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2372,6 +2456,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dl
		$shared_target= hpux-shared
		$shared_cflag = -fPIC
		@@ -2400,6 +2485,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2428,6 +2514,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = -fpic
		@@ -2456,6 +2543,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = +Z
		@@ -2484,6 +2572,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= hpux-shared
		$shared_cflag = -fpic
		@@ -2512,6 +2601,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2540,6 +2630,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2568,6 +2659,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2596,6 +2688,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2624,6 +2717,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2652,6 +2746,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2680,6 +2775,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= irix-shared
		$shared_cflag =
		@@ -2708,6 +2804,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2736,6 +2833,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2764,6 +2862,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2792,6 +2891,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2820,6 +2920,7 @@ $rc4_obj = rx86-out.o
		$rmd160_obj = rm86-out.o
		$rc5_obj = r586-out.o
		$wp_obj = wp_block.o w86mmx-out.o
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -2848,6 +2949,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2876,6 +2978,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2904,6 +3007,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2932,6 +3036,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -KPIC
		@@ -2960,6 +3065,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -2988,6 +3094,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3016,6 +3123,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3044,6 +3152,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3072,6 +3181,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3100,6 +3210,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3128,6 +3239,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3156,6 +3268,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3184,6 +3297,7 @@ $rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3212,6 +3326,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= linux-shared
		$shared_cflag = -fPIC
		@@ -3240,6 +3355,7 @@ $rc4_obj = rx86-cof.o
		$rmd160_obj = rm86-cof.o
		$rc5_obj = r586-cof.o
		$wp_obj = wp_block.o w86mmx-cof.o
		$cmll_obj =
		$dso_scheme = win32
		$shared_target= cygwin-shared
		$shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK
		@@ -3268,6 +3384,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3296,6 +3413,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3324,6 +3442,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3352,6 +3471,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3380,6 +3500,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3408,6 +3529,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3436,6 +3558,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3464,6 +3587,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3492,6 +3616,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= alpha-osf1-shared
		$shared_cflag =
		@@ -3520,6 +3645,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= alpha-osf1-shared
		$shared_cflag =
		@@ -3548,6 +3674,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3576,6 +3703,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3604,6 +3732,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3632,6 +3761,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -3660,6 +3790,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= svr3-shared
		$shared_cflag = -Kpic
		@@ -3688,6 +3819,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= svr3-shared
		$shared_cflag = -fPIC
		@@ -3716,6 +3848,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -3744,6 +3877,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -3772,6 +3906,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -3800,6 +3935,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -3828,6 +3964,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -3856,6 +3993,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -3884,6 +4022,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -3912,6 +4051,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -3940,6 +4080,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -3968,6 +4109,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -3996,6 +4138,7 @@ $rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -KPIC
		@@ -4024,6 +4167,7 @@ $rc4_obj = rc4-x86_64.o
		$rmd160_obj =
		$rc5_obj =
		$wp_obj = wp-x86_64.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= solaris-shared
		$shared_cflag = -fPIC
		@@ -4052,6 +4196,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4080,6 +4225,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4108,6 +4254,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= alpha-osf1-shared
		$shared_cflag =
		@@ -4136,6 +4283,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4164,6 +4312,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4192,6 +4341,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4220,6 +4370,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4248,6 +4399,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= svr5-shared
		$shared_cflag = -Kpic
		@@ -4276,6 +4428,7 @@ $rc4_obj = rx86-elf.o
		$rmd160_obj = rm86-elf.o
		$rc5_obj = r586-elf.o
		$wp_obj = wp_block.o w86mmx-elf.o
		$cmll_obj =
		$dso_scheme = dlfcn
		$shared_target= gnu-shared
		$shared_cflag = -fPIC
		@@ -4304,6 +4457,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4332,6 +4486,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4360,6 +4515,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4388,6 +4544,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4416,6 +4573,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =
		@@ -4444,6 +4602,7 @@ $rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$dso_scheme =
		$shared_target=
		$shared_cflag =

crypto/camellia/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ CFLAG=-g
		MAKEFILE= Makefile
		AR= ar r

		CAMELLIA_ASM_OBJ=
		CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o

		CFLAGS= $(INCLUDES) $(CFLAG)
		ASFLAGS= $(INCLUDES) $(ASFLAG)
		@@ -25,8 +25,7 @@ LIB=$(TOP)/libcrypto.a
		LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
		cmll_cfb.c cmll_ctr.c

		LIBOBJ= camellia.o cmll_misc.o cmll_ecb.o cmll_cbc.o cmll_ofb.o \
		cmll_cfb.o cmll_ctr.o $(CAMELLIA_ASM_OBJ)
		LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)

		SRC= $(LIBSRC)