Commit 3659df7d authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 

(I'm quite worried about what this will do to compatibility with
earlier 0.9.7 versions)
parent 16f1fdbc

TABLE

+50 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,56 @@ $shared_extension = 
$ranlib       = 

$arflags      = 



*** debug-ben-fips

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = 

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 



*** debug-ben-fips-debug

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = 

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 



*** debug-ben-openbsd

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe

fips/Makefile.ssl

+1 −7
Original line number Diff line number Diff line
@@ -160,10 +160,4 @@ fips.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h 
fips.o: ../include/openssl/safestack.h ../include/openssl/stack.h

fips.o: ../include/openssl/symhacks.h ../include/openssl/ui.h

fips.o: ../include/openssl/ui_compat.h fips.c

fips_err_wrapper.o: ../include/openssl/bio.h ../include/openssl/crypto.h

fips_err_wrapper.o: ../include/openssl/e_os2.h ../include/openssl/err.h

fips_err_wrapper.o: ../include/openssl/fips.h ../include/openssl/lhash.h

fips_err_wrapper.o: ../include/openssl/opensslconf.h

fips_err_wrapper.o: ../include/openssl/opensslv.h

fips_err_wrapper.o: ../include/openssl/safestack.h ../include/openssl/stack.h

fips_err_wrapper.o: ../include/openssl/symhacks.h fips_err.c fips_err_wrapper.c
 
fips_err_wrapper.o: fips_err_wrapper.c

fips/des/Makefile.ssl

+9 −0
Original line number Diff line number Diff line
@@ -94,3 +94,12 @@ dclean: 
clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

# DO NOT DELETE THIS LINE -- make depend depends on it.



fips_des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

fips_des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h

fips_des_enc.o: ../../include/openssl/opensslconf.h

fips_des_enc.o: ../../include/openssl/opensslv.h

fips_des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

fips_des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

fips_des_enc.o: ../../include/openssl/ui_compat.h fips_des_enc.c

fips_des_enc.o: fips_des_locl.h

fips/sha1/Makefile.ssl

+1 −4
Original line number Diff line number Diff line
@@ -88,7 +88,4 @@ clean: 
	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

# DO NOT DELETE THIS LINE -- make depend depends on it.



fips_sha1dgst.o: ../../include/openssl/e_os2.h

fips_sha1dgst.o: ../../include/openssl/opensslconf.h

fips_sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h

fips_sha1dgst.o: fips_md32_common.h fips_sha1dgst.c fips_sha_locl.h
 
fips_sha1dgst.o: ../../include/openssl/opensslv.h fips_sha1dgst.c

util/libeay.num

+38 −11
Original line number Diff line number Diff line
@@ -284,20 +284,20 @@ EVP_add_alias 291 NOEXIST::FUNCTION: 
EVP_add_cipher                          292	EXIST::FUNCTION:

EVP_add_digest                          293	EXIST::FUNCTION:

EVP_bf_cbc                              294	EXIST::FUNCTION:BF

EVP_bf_cfb                              295	EXIST::FUNCTION:BF

EVP_bf_cfb                              295	NOEXIST::FUNCTION:

EVP_bf_ecb                              296	EXIST::FUNCTION:BF

EVP_bf_ofb                              297	EXIST::FUNCTION:BF

EVP_cleanup                             298	EXIST::FUNCTION:

EVP_des_cbc                             299	EXIST::FUNCTION:DES

EVP_des_cfb                             300	EXIST::FUNCTION:DES

EVP_des_cfb                             300	NOEXIST::FUNCTION:

EVP_des_ecb                             301	EXIST::FUNCTION:DES

EVP_des_ede                             302	EXIST::FUNCTION:DES

EVP_des_ede3                            303	EXIST::FUNCTION:DES

EVP_des_ede3_cbc                        304	EXIST::FUNCTION:DES

EVP_des_ede3_cfb                        305	EXIST::FUNCTION:DES

EVP_des_ede3_cfb                        305	NOEXIST::FUNCTION:

EVP_des_ede3_ofb                        306	EXIST::FUNCTION:DES

EVP_des_ede_cbc                         307	EXIST::FUNCTION:DES

EVP_des_ede_cfb                         308	EXIST::FUNCTION:DES

EVP_des_ede_cfb                         308	NOEXIST::FUNCTION:

EVP_des_ede_ofb                         309	EXIST::FUNCTION:DES

EVP_des_ofb                             310	EXIST::FUNCTION:DES

EVP_desx_cbc                            311	EXIST::FUNCTION:DES
@@ -308,14 +308,14 @@ EVP_get_cipherbyname 315 EXIST::FUNCTION: 
EVP_get_digestbyname                    316	EXIST::FUNCTION:

EVP_get_pw_prompt                       317	EXIST::FUNCTION:

EVP_idea_cbc                            318	EXIST::FUNCTION:IDEA

EVP_idea_cfb                            319	EXIST::FUNCTION:IDEA

EVP_idea_cfb                            319	NOEXIST::FUNCTION:

EVP_idea_ecb                            320	EXIST::FUNCTION:IDEA

EVP_idea_ofb                            321	EXIST::FUNCTION:IDEA

EVP_md2                                 322	EXIST::FUNCTION:MD2

EVP_md5                                 323	EXIST::FUNCTION:MD5

EVP_md_null                             324	EXIST::FUNCTION:

EVP_rc2_cbc                             325	EXIST::FUNCTION:RC2

EVP_rc2_cfb                             326	EXIST::FUNCTION:RC2

EVP_rc2_cfb                             326	NOEXIST::FUNCTION:

EVP_rc2_ecb                             327	EXIST::FUNCTION:RC2

EVP_rc2_ofb                             328	EXIST::FUNCTION:RC2

EVP_rc4                                 329	EXIST::FUNCTION:RC4
@@ -962,7 +962,7 @@ i2t_ASN1_OBJECT 979 EXIST::FUNCTION: 
BN_BLINDING_new                         980	EXIST::FUNCTION:

BN_BLINDING_free                        981	EXIST::FUNCTION:

EVP_cast5_cbc                           983	EXIST::FUNCTION:CAST

EVP_cast5_cfb                           984	EXIST::FUNCTION:CAST

EVP_cast5_cfb                           984	NOEXIST::FUNCTION:

EVP_cast5_ecb                           985	EXIST::FUNCTION:CAST

EVP_cast5_ofb                           986	EXIST::FUNCTION:CAST

BF_decrypt                              987	EXIST::FUNCTION:BF
@@ -1057,7 +1057,7 @@ EVP_CIPHER_param_to_asn1 1084 EXIST::FUNCTION: 
EVP_CIPHER_get_asn1_iv                  1085	EXIST::FUNCTION:

EVP_CIPHER_set_asn1_iv                  1086	EXIST::FUNCTION:

EVP_rc5_32_12_16_cbc                    1087	EXIST::FUNCTION:RC5

EVP_rc5_32_12_16_cfb                    1088	EXIST::FUNCTION:RC5

EVP_rc5_32_12_16_cfb                    1088	NOEXIST::FUNCTION:

EVP_rc5_32_12_16_ecb                    1089	EXIST::FUNCTION:RC5

EVP_rc5_32_12_16_ofb                    1090	EXIST::FUNCTION:RC5

asn1_add_error                          1091	EXIST::FUNCTION:
@@ -2776,10 +2776,10 @@ ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE 
_ossl_096_des_random_seed               3219	EXIST::FUNCTION:DES

EVP_aes_256_ofb                         3220	EXIST::FUNCTION:AES

EVP_aes_192_ofb                         3221	EXIST::FUNCTION:AES

EVP_aes_128_cfb                         3222	EXIST::FUNCTION:AES

EVP_aes_256_cfb                         3223	EXIST::FUNCTION:AES

EVP_aes_128_cfb                         3222	NOEXIST::FUNCTION:

EVP_aes_256_cfb                         3223	NOEXIST::FUNCTION:

EVP_aes_128_ofb                         3224	EXIST::FUNCTION:AES

EVP_aes_192_cfb                         3225	EXIST::FUNCTION:AES

EVP_aes_192_cfb                         3225	NOEXIST::FUNCTION:

CONF_modules_free                       3226	EXIST::FUNCTION:

NCONF_default                           3227	EXIST::FUNCTION:

OPENSSL_no_config                       3228	EXIST::FUNCTION:
@@ -2801,3 +2801,30 @@ BIO_indent 3242 EXIST::FUNCTION: 
BUF_strlcpy                             3243	EXIST::FUNCTION:

OpenSSLDie                              3244	EXIST::FUNCTION:

OPENSSL_cleanse                         3245	EXIST::FUNCTION:

EVP_cast5_cfb64                         3246	EXIST::FUNCTION:CAST

EVP_aes_128_cfb8                        3247	EXIST::FUNCTION:AES

ENGINE_setup_bsd_cryptodev              3248	EXIST:__FreeBSD__:FUNCTION:ENGINE

EVP_aes_256_cfb128                      3249	EXIST::FUNCTION:AES

EVP_des_ede3_cfb64                      3250	EXIST::FUNCTION:DES

EVP_aes_128_cfb1                        3251	EXIST::FUNCTION:AES

EVP_aes_192_cfb8                        3252	EXIST::FUNCTION:AES

EVP_des_cfb64                           3253	EXIST::FUNCTION:DES

EVP_rc2_cfb64                           3254	EXIST::FUNCTION:RC2

EVP_aes_256_cfb8                        3255	EXIST::FUNCTION:AES

EVP_aes_128_cfb128                      3256	EXIST::FUNCTION:AES

EVP_bf_cfb64                            3257	EXIST::FUNCTION:BF

EVP_des_ede3_cfb8                       3258	EXIST::FUNCTION:DES

AES_cfbr_encrypt_block                  3259	EXIST::FUNCTION:AES

AES_cfb8_encrypt                        3260	EXIST::FUNCTION:AES

EVP_des_ede_cfb64                       3261	EXIST::FUNCTION:DES

EVP_aes_192_cfb128                      3262	EXIST::FUNCTION:AES

EVP_aes_192_cfb1                        3263	EXIST::FUNCTION:AES

EVP_des_cfb8                            3264	EXIST::FUNCTION:DES

EVP_des_ede_cfb8                        3265	EXIST::FUNCTION:DES

EVP_aes_256_cfb1                        3266	EXIST::FUNCTION:AES

EVP_des_ede_cfb1                        3267	EXIST::FUNCTION:DES

EVP_idea_cfb64                          3268	EXIST::FUNCTION:IDEA

EVP_rc5_32_12_16_cfb64                  3269	EXIST::FUNCTION:RC5

EVP_des_cfb1                            3270	EXIST::FUNCTION:DES

AES_cfb1_encrypt                        3271	EXIST::FUNCTION:AES

EVP_des_ede3_cfb1                       3272	EXIST::FUNCTION:DES