Add test header, sync ordinals with 1.0.2

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/test/Makefile b/test/Makefile
index 40898fc04081f6bd353991018c87c5c8164cd532..3f78c68d3c3968d337a9bf608cdb61205335a8a9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -150,7 +150,7 @@ SRC=        $(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
        testutil.c
 
 EXHEADER= 
        testutil.c
 
 EXHEADER= 

-HEADER=        $(EXHEADER)
+HEADER=        testutil.h $(EXHEADER)

 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 

diff --git a/util/libeay.num b/util/libeay.num
index 303676cab0fe27db06e59862c5a871720004fcf6..5c72172df9f3bef59bca7e66a152014a552e1ba6 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4280,7 +4280,7 @@ CRYPTO_ccm128_decrypt                   4648      EXIST::FUNCTION:
 CRYPTO_ccm128_aad                       4649   EXIST::FUNCTION:
 CRYPTO_gcm128_init                      4650   EXIST::FUNCTION:
 CRYPTO_gcm128_decrypt                   4651   EXIST::FUNCTION:
 CRYPTO_ccm128_aad                       4649   EXIST::FUNCTION:
 CRYPTO_gcm128_init                      4650   EXIST::FUNCTION:
 CRYPTO_gcm128_decrypt                   4651   EXIST::FUNCTION:

-ENGINE_load_rsax                        4652   EXIST::FUNCTION:ENGINE
+ENGINE_load_rsax                        4652   NOEXIST::FUNCTION:

 CRYPTO_gcm128_decrypt_ctr32             4653   EXIST::FUNCTION:
 CRYPTO_gcm128_encrypt_ctr32             4654   EXIST::FUNCTION:
 CRYPTO_gcm128_finish                    4655   EXIST::FUNCTION:
 CRYPTO_gcm128_decrypt_ctr32             4653   EXIST::FUNCTION:
 CRYPTO_gcm128_encrypt_ctr32             4654   EXIST::FUNCTION:
 CRYPTO_gcm128_finish                    4655   EXIST::FUNCTION:


@@ -4404,15 +4404,15 @@ X509V3_EXT_free                         4763    NOEXIST::FUNCTION:
 BIO_hex_string                          4764   EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_hostflags         4765   EXIST::FUNCTION:
 BUF_strnlen                             4766   EXIST::FUNCTION:
 BIO_hex_string                          4764   EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_hostflags         4765   EXIST::FUNCTION:
 BUF_strnlen                             4766   EXIST::FUNCTION:

-FIPS_ecdsa_verify_digest                4767   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
-FIPS_dsa_sign_digest                    4768   EXIST:OPENSSL_FIPS:FUNCTION:DSA
-BN_generate_dsa_nonce                   4769   EXIST::FUNCTION:
-ASN1_SCTX_get_flags                     4770   EXIST::FUNCTION:
-FIPS_dsa_verify_ctx                     4771   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+X509_VERIFY_PARAM_get0_peername         4767   EXIST::FUNCTION:
+ECDSA_METHOD_set_app_data               4768   EXIST::FUNCTION:ECDSA
+sk_deep_copy                            4769   EXIST::FUNCTION:
+ECDSA_METHOD_get_app_data               4770   EXIST::FUNCTION:ECDSA
+X509_VERIFY_PARAM_add1_host             4771   EXIST::FUNCTION:

 FIPS_dsa_sign_ctx                       4772   EXIST:OPENSSL_FIPS:FUNCTION:DSA
 FIPS_ecdsa_sign                         4773   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 RSA_security_bits                       4774   EXIST::FUNCTION:RSA
 FIPS_dsa_sign_ctx                       4772   EXIST:OPENSSL_FIPS:FUNCTION:DSA
 FIPS_ecdsa_sign                         4773   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 RSA_security_bits                       4774   EXIST::FUNCTION:RSA

-X509_VERIFY_PARAM_get0_peername         4775   EXIST::FUNCTION:
+FIPS_ecdsa_verify_digest                4775   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA

 FIPS_ecdsa_verify                       4776   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 BN_security_bits                        4777   EXIST::FUNCTION:
 FIPS_ecdsa_verify_ctx                   4778   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 FIPS_ecdsa_verify                       4776   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 BN_security_bits                        4777   EXIST::FUNCTION:
 FIPS_ecdsa_verify_ctx                   4778   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA


@@ -4429,7 +4429,7 @@ ASN1_add_stable_module                  4788      EXIST::FUNCTION:
 DSA_security_bits                       4789   EXIST::FUNCTION:DSA
 ASN1_SCTX_get_item                      4790   EXIST::FUNCTION:
 ASN1_SCTX_get_app_data                  4791   EXIST::FUNCTION:
 DSA_security_bits                       4789   EXIST::FUNCTION:DSA
 ASN1_SCTX_get_item                      4790   EXIST::FUNCTION:
 ASN1_SCTX_get_app_data                  4791   EXIST::FUNCTION:

-ECDSA_METHOD_set_app_data               4792   EXIST::FUNCTION:ECDSA
+FIPS_dsa_sign_digest                    4792   EXIST:OPENSSL_FIPS:FUNCTION:DSA

 CRYPTO_128_unwrap_pad                   4793   EXIST::FUNCTION:
 ASN1_str2mask                           4794   EXIST::FUNCTION:
 EVP_aes_256_wrap_pad                    4795   EXIST::FUNCTION:AES
 CRYPTO_128_unwrap_pad                   4793   EXIST::FUNCTION:
 ASN1_str2mask                           4794   EXIST::FUNCTION:
 EVP_aes_256_wrap_pad                    4795   EXIST::FUNCTION:AES


@@ -4437,12 +4437,12 @@ CRYPTO_128_wrap_pad                     4796    EXIST::FUNCTION:
 FIPS_ecdsa_sign_ctx                     4797   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 FIPS_ecdsa_sign_digest                  4798   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 ASN1_SCTX_new                           4799   EXIST::FUNCTION:
 FIPS_ecdsa_sign_ctx                     4797   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 FIPS_ecdsa_sign_digest                  4798   EXIST:OPENSSL_FIPS:FUNCTION:ECDSA
 ASN1_SCTX_new                           4799   EXIST::FUNCTION:

-sk_deep_copy                            4800   EXIST::FUNCTION:
+BN_generate_dsa_nonce                   4800   EXIST::FUNCTION:

 EVP_PKEY_security_bits                  4801   EXIST::FUNCTION:
 BN_nist_mod_func                        4802   EXIST::FUNCTION:
 EVP_PKEY_security_bits                  4801   EXIST::FUNCTION:
 BN_nist_mod_func                        4802   EXIST::FUNCTION:

-ECDSA_METHOD_get_app_data               4803   EXIST::FUNCTION:ECDSA
+ASN1_SCTX_get_flags                     4803   EXIST::FUNCTION:

 FIPS_dsa_verify                         4804   EXIST:OPENSSL_FIPS:FUNCTION:DSA
 FIPS_dsa_verify                         4804   EXIST:OPENSSL_FIPS:FUNCTION:DSA

-X509_VERIFY_PARAM_add1_host             4805   EXIST::FUNCTION:
+FIPS_dsa_verify_ctx                     4805   EXIST:OPENSSL_FIPS:FUNCTION:DSA

 FIPS_selftest                           4806   NOEXIST::FUNCTION:
 FIPS_set_error_callbacks                4807   NOEXIST::FUNCTION:
 FIPS_drbg_set_check_interval            4808   NOEXIST::FUNCTION:
 FIPS_selftest                           4806   NOEXIST::FUNCTION:
 FIPS_set_error_callbacks                4807   NOEXIST::FUNCTION:
 FIPS_drbg_set_check_interval            4808   NOEXIST::FUNCTION: