Commit 01ad8195 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove debugging command.

Reorder fipssyms.h to include assembly language symbols at the end.
parent d87f52cb
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
		set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \
	elif $(CC) -dumpversion >/dev/null 2>&1; then \
		set -x; $(CC) $$cflags -r -nostdlib -o $@ $$objs ; \
		echo OBJS $$objs >/tmp/objs.txt ; \
	else case "$$os" in \
		HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
		*) set -x; $(CC) $$cflags -r -o $@ $$objs ;; \
+50 −42
Original line number Diff line number Diff line
#define AES_cbc_encrypt FIPS_aes_cbc_encrypt
#define AES_cfb128_encrypt FIPS_aes_cfb128_encrypt
#define AES_cfb1_encrypt FIPS_aes_cfb1_encrypt
#define AES_cfb8_encrypt FIPS_aes_cfb8_encrypt
#define AES_decrypt FIPS_aes_decrypt
#define AES_ecb_encrypt FIPS_aes_ecb_encrypt
#define AES_encrypt FIPS_aes_encrypt
#define AES_ofb128_encrypt FIPS_aes_ofb128_encrypt
#define AES_set_decrypt_key FIPS_aes_set_decrypt_key
#define AES_set_encrypt_key FIPS_aes_set_encrypt_key
#define BN_BLINDING_convert FIPS_bn_blinding_convert
#define BN_BLINDING_convert_ex FIPS_bn_blinding_convert_ex
#define BN_BLINDING_create_param FIPS_bn_blinding_create_param
@@ -73,7 +68,6 @@
#define BN_dup FIPS_bn_dup
#define BN_exp FIPS_bn_exp
#define BN_free FIPS_bn_free
#define BN_from_montgomery FIPS_bn_from_montgomery
#define BN_gcd FIPS_bn_gcd
#define BN_generate_prime_ex FIPS_bn_generate_prime_ex
#define BN_get0_nist_prime_192 FIPS_bn_get0_nist_prime_192
@@ -121,7 +115,6 @@
#define BN_nist_mod_func FIPS_bn_nist_mod_func
#define BN_nnmod FIPS_bn_nnmod
#define BN_num_bits FIPS_bn_num_bits
#define BN_num_bits_word FIPS_bn_num_bits_word
#define BN_pseudo_rand FIPS_bn_pseudo_rand
#define BN_pseudo_rand_range FIPS_bn_pseudo_rand_range
#define BN_rand FIPS_bn_rand
@@ -173,24 +166,17 @@
#define CRYPTO_gcm128_setiv FIPS_crypto_gcm128_setiv
#define CRYPTO_gcm128_tag FIPS_crypto_gcm128_tag
#define CRYPTO_ofb128_encrypt FIPS_crypto_ofb128_encrypt
#define DES_SPtrans FIPS_des_sptrans
#define DES_cfb64_encrypt FIPS_des_cfb64_encrypt
#define DES_cfb_encrypt FIPS_des_cfb_encrypt
#define DES_check_key_parity FIPS_des_check_key_parity
#define DES_crypt FIPS_des_crypt
#define DES_decrypt3 FIPS_des_decrypt3
#define DES_ecb3_encrypt FIPS_des_ecb3_encrypt
#define DES_ede3_cbc_encrypt FIPS_des_ede3_cbc_encrypt
#define DES_ede3_cfb64_encrypt FIPS_des_ede3_cfb64_encrypt
#define DES_ede3_cfb_encrypt FIPS_des_ede3_cfb_encrypt
#define DES_ede3_ofb64_encrypt FIPS_des_ede3_ofb64_encrypt
#define DES_encrypt1 FIPS_des_encrypt1
#define DES_encrypt2 FIPS_des_encrypt2
#define DES_encrypt3 FIPS_des_encrypt3
#define DES_fcrypt FIPS_des_fcrypt
#define DES_is_weak_key FIPS_des_is_weak_key
#define DES_key_sched FIPS_des_key_sched
#define DES_ncbc_encrypt FIPS_des_ncbc_encrypt
#define DES_set_key FIPS_des_set_key
#define DES_set_key_checked FIPS_des_set_key_checked
#define DES_set_key_unchecked FIPS_des_set_key_unchecked
@@ -345,18 +331,11 @@
#define HMAC_Init_ex FIPS_hmac_init_ex
#define HMAC_Update FIPS_hmac_update
#define OPENSSL_NONPIC_relocated FIPS_openssl_nonpic_relocated
#define OPENSSL_atomic_add FIPS_openssl_atomic_add
#define OPENSSL_cleanse FIPS_openssl_cleanse
#define OPENSSL_cpuid_setup FIPS_openssl_cpuid_setup
#define OPENSSL_ia32_cpuid FIPS_openssl_ia32_cpuid
#define OPENSSL_ia32cap_P FIPS_openssl_ia32cap_p
#define OPENSSL_ia32cap_loc FIPS_openssl_ia32cap_loc
#define OPENSSL_isservice FIPS_openssl_isservice
#define OPENSSL_issetugid FIPS_openssl_issetugid
#define OPENSSL_rdtsc FIPS_openssl_rdtsc
#define OPENSSL_showfatal FIPS_openssl_showfatal
#define OPENSSL_stderr FIPS_openssl_stderr
#define OPENSSL_wipe_cpu FIPS_openssl_wipe_cpu
#define OpenSSLDie FIPS_openssldie
#define PKCS1_MGF1 FIPS_pkcs1_mgf1
#define RAND_SSLeay FIPS_rand_ssleay
@@ -415,7 +394,6 @@
#define SHA224_Final FIPS_sha224_final
#define SHA224_Init FIPS_sha224_init
#define SHA224_Update FIPS_sha224_update
#define SHA256 FIPS_sha256
#define SHA256_Final FIPS_sha256_final
#define SHA256_Init FIPS_sha256_init
#define SHA256_Transform FIPS_sha256_transform
@@ -425,7 +403,6 @@
#define SHA384_Final FIPS_sha384_final
#define SHA384_Init FIPS_sha384_init
#define SHA384_Update FIPS_sha384_update
#define SHA512 FIPS_sha512
#define SHA512_Final FIPS_sha512_final
#define SHA512_Init FIPS_sha512_init
#define SHA512_Transform FIPS_sha512_transform
@@ -433,38 +410,21 @@
#define SHA512_version FIPS_sha512_version
#define _shadow_DES_check_key fips__shadow_des_check_key
#define aesni_cbc_encrypt fips_aesni_cbc_encrypt
#define aesni_ccm64_decrypt_blocks fips_aesni_ccm64_decrypt_blocks
#define aesni_ccm64_encrypt_blocks fips_aesni_ccm64_encrypt_blocks
#define aesni_ctr32_encrypt_blocks fips_aesni_ctr32_encrypt_blocks
#define aesni_decrypt fips_aesni_decrypt
#define aesni_ecb_encrypt fips_aesni_ecb_encrypt
#define aesni_encrypt fips_aesni_encrypt
#define aesni_set_decrypt_key fips_aesni_set_decrypt_key
#define aesni_set_encrypt_key fips_aesni_set_encrypt_key
#define bn_add_part_words fips_bn_add_part_words
#define bn_add_words fips_bn_add_words
#define bn_cmp_part_words fips_bn_cmp_part_words
#define bn_cmp_words fips_bn_cmp_words
#define bn_div_words fips_bn_div_words
#define bn_expand2 fips_bn_expand2
#define bn_mul_add_words fips_bn_mul_add_words
#define bn_mul_comba4 fips_bn_mul_comba4
#define bn_mul_comba8 fips_bn_mul_comba8
#define bn_mul_high fips_bn_mul_high
#define bn_mul_low_normal fips_bn_mul_low_normal
#define bn_mul_low_recursive fips_bn_mul_low_recursive
#define bn_mul_mont fips_bn_mul_mont
#define bn_mul_normal fips_bn_mul_normal
#define bn_mul_part_recursive fips_bn_mul_part_recursive
#define bn_mul_recursive fips_bn_mul_recursive
#define bn_mul_words fips_bn_mul_words
#define bn_sqr_comba4 fips_bn_sqr_comba4
#define bn_sqr_comba8 fips_bn_sqr_comba8
#define bn_sqr_normal fips_bn_sqr_normal
#define bn_sqr_recursive fips_bn_sqr_recursive
#define bn_sqr_words fips_bn_sqr_words
#define bn_sub_part_words fips_bn_sub_part_words
#define bn_sub_words fips_bn_sub_words
#define dsa_builtin_paramgen fips_dsa_builtin_paramgen
#define dsa_builtin_paramgen2 fips_dsa_builtin_paramgen2
#define ec_GF2m_have_precompute_mult fips_ec_gf2m_have_precompute_mult
@@ -540,14 +500,62 @@
#define ec_wNAF_have_precompute_mult fips_ec_wnaf_have_precompute_mult
#define ec_wNAF_mul fips_ec_wnaf_mul
#define ec_wNAF_precompute_mult fips_ec_wnaf_precompute_mult
#define int_bn_mod_inverse fips_int_bn_mod_inverse
#define cleanse_ctr fips_cleanse_ctr
#define gcm_gmult_4bit_x86 fips_gcm_gmult_4bit_x86
#define gcm_ghash_4bit_x86 fips_gcm_ghash_4bit_x86
/* assembler symbols */
#define AES_cbc_encrypt FIPS_aes_cbc_encrypt
#define AES_decrypt FIPS_aes_decrypt
#define AES_encrypt FIPS_aes_encrypt
#define AES_set_decrypt_key FIPS_aes_set_decrypt_key
#define AES_set_encrypt_key FIPS_aes_set_encrypt_key
#define BN_from_montgomery FIPS_bn_from_montgomery
#define BN_num_bits_word FIPS_bn_num_bits_word
#define DES_SPtrans FIPS_des_sptrans
#define DES_decrypt3 FIPS_des_decrypt3
#define DES_ede3_cbc_encrypt FIPS_des_ede3_cbc_encrypt
#define DES_encrypt1 FIPS_des_encrypt1
#define DES_encrypt2 FIPS_des_encrypt2
#define DES_encrypt3 FIPS_des_encrypt3
#define DES_ncbc_encrypt FIPS_des_ncbc_encrypt
#define OPENSSL_atomic_add FIPS_openssl_atomic_add
#define OPENSSL_cleanse FIPS_openssl_cleanse
#define OPENSSL_cpuid_setup FIPS_openssl_cpuid_setup
#define OPENSSL_ia32_cpuid FIPS_openssl_ia32_cpuid
#define OPENSSL_ia32cap_P FIPS_openssl_ia32cap_p
#define OPENSSL_rdtsc FIPS_openssl_rdtsc
#define OPENSSL_wipe_cpu FIPS_openssl_wipe_cpu
#define SHA256 FIPS_sha256
#define SHA512 FIPS_sha512
#define aesni_ccm64_decrypt_blocks fips_aesni_ccm64_decrypt_blocks
#define aesni_ccm64_encrypt_blocks fips_aesni_ccm64_encrypt_blocks
#define aesni_ctr32_encrypt_blocks fips_aesni_ctr32_encrypt_blocks
#define aesni_ecb_encrypt fips_aesni_ecb_encrypt
#define aesni_encrypt fips_aesni_encrypt
#define bn_add_words fips_bn_add_words
#define bn_div_words fips_bn_div_words
#define bn_mul_add_words fips_bn_mul_add_words
#define bn_mul_comba4 fips_bn_mul_comba4
#define bn_mul_comba8 fips_bn_mul_comba8
#define bn_mul_mont fips_bn_mul_mont
#define bn_mul_words fips_bn_mul_words
#define bn_sqr_comba4 fips_bn_sqr_comba4
#define bn_sqr_comba8 fips_bn_sqr_comba8
#define bn_sqr_words fips_bn_sqr_words
#define bn_sub_part_words fips_bn_sub_part_words
#define bn_sub_words fips_bn_sub_words
#define fcrypt_body fips_fcrypt_body
#define gcm_ghash_4bit fips_gcm_ghash_4bit
#define gcm_ghash_clmul fips_gcm_ghash_clmul
#define gcm_gmult_4bit fips_gcm_gmult_4bit
#define gcm_gmult_clmul fips_gcm_gmult_clmul
#define gcm_init_clmul fips_gcm_init_clmul
#define int_bn_mod_inverse fips_int_bn_mod_inverse
#define sha1_block_data_order fips_sha1_block_data_order
#define sha256_block_data_order fips_sha256_block_data_order
#define sha512_block_data_order fips_sha512_block_data_order
#define cleanse_ctr fips_cleanse_ctr
#define gcm_gmult_4bit_mmx fips_gcm_gmult_4bit_mmx
#define gcm_ghash_4bit_mmx fips_gcm_ghash_4bit_mmx
#define OPENSSL_far_spin fips_openssl_far_spin
#define OPENSSL_indirect_call fips_openssl_indirect_call
#define OPENSSL_instrument_halt fips_openssl_instrument_halt