make update

Note that all *_it variables are suddenly non-existant according to
libeay.num.  This is a bug that will be corrected.  Please be patient.

2 files changed, 34 insertions, 32 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 35b7bb997a..6c76287f5f 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -196,8 +196,8 @@ DH_generate_key                         203	EXIST::FUNCTION:DH
 DH_generate_parameters                  204	EXIST::FUNCTION:DH
 DH_new                                  205	EXIST::FUNCTION:DH
 DH_size                                 206	EXIST::FUNCTION:DH
-DHparams_print                          207	EXIST::FUNCTION:DH,BIO
-DHparams_print_fp                       208	EXIST::FUNCTION:FP_API,DH
+DHparams_print                          207	EXIST::FUNCTION:BIO,DH
+DHparams_print_fp                       208	EXIST::FUNCTION:DH,FP_API
 DSA_free                                209	EXIST::FUNCTION:DSA
 DSA_generate_key                        210	EXIST::FUNCTION:DSA
 DSA_generate_parameters                 211	EXIST::FUNCTION:DSA
@@ -301,8 +301,8 @@ EVP_des_ede_cfb                         308	EXIST::FUNCTION:DES
 EVP_des_ede_ofb                         309	EXIST::FUNCTION:DES
 EVP_des_ofb                             310	EXIST::FUNCTION:DES
 EVP_desx_cbc                            311	EXIST::FUNCTION:DES
-EVP_dss                                 312	EXIST::FUNCTION:SHA,DSA
-EVP_dss1                                313	EXIST::FUNCTION:SHA,DSA
+EVP_dss                                 312	EXIST::FUNCTION:DSA,SHA
+EVP_dss1                                313	EXIST::FUNCTION:DSA,SHA
 EVP_enc_null                            314	EXIST::FUNCTION:
 EVP_get_cipherbyname                    315	EXIST::FUNCTION:
 EVP_get_digestbyname                    316	EXIST::FUNCTION:
@@ -477,8 +477,8 @@ RSA_free                                484	EXIST::FUNCTION:RSA
 RSA_generate_key                        485	EXIST::FUNCTION:RSA
 RSA_new                                 486	EXIST::FUNCTION:RSA
 RSA_new_method                          487	EXIST::FUNCTION:RSA
-RSA_print                               488	EXIST::FUNCTION:RSA,BIO
-RSA_print_fp                            489	EXIST::FUNCTION:FP_API,RSA
+RSA_print                               488	EXIST::FUNCTION:BIO,RSA
+RSA_print_fp                            489	EXIST::FUNCTION:RSA,FP_API
 RSA_private_decrypt                     490	EXIST::FUNCTION:RSA
 RSA_private_encrypt                     491	EXIST::FUNCTION:RSA
 RSA_public_decrypt                      492	EXIST::FUNCTION:RSA
@@ -489,14 +489,14 @@ RSA_sign_ASN1_OCTET_STRING              496	EXIST::FUNCTION:RSA
 RSA_size                                497	EXIST::FUNCTION:RSA
 RSA_verify                              498	EXIST::FUNCTION:RSA
 RSA_verify_ASN1_OCTET_STRING            499	EXIST::FUNCTION:RSA
-SHA                                     500	EXIST::FUNCTION:SHA,SHA0
+SHA                                     500	EXIST::FUNCTION:SHA0,SHA
 SHA1                                    501	EXIST::FUNCTION:SHA,SHA1
 SHA1_Final                              502	EXIST::FUNCTION:SHA,SHA1
 SHA1_Init                               503	EXIST::FUNCTION:SHA,SHA1
 SHA1_Update                             504	EXIST::FUNCTION:SHA,SHA1
-SHA_Final                               505	EXIST::FUNCTION:SHA,SHA0
-SHA_Init                                506	EXIST::FUNCTION:SHA,SHA0
-SHA_Update                              507	EXIST::FUNCTION:SHA,SHA0
+SHA_Final                               505	EXIST::FUNCTION:SHA0,SHA
+SHA_Init                                506	EXIST::FUNCTION:SHA0,SHA
+SHA_Update                              507	EXIST::FUNCTION:SHA0,SHA
 OpenSSL_add_all_algorithms              508	EXIST::FUNCTION:
 OpenSSL_add_all_ciphers                 509	EXIST::FUNCTION:
 OpenSSL_add_all_digests                 510	EXIST::FUNCTION:
@@ -741,8 +741,8 @@ d2i_PKCS7_fp                            747	EXIST::FUNCTION:FP_API
 d2i_PrivateKey                          748	EXIST::FUNCTION:
 d2i_PublicKey                           749	EXIST::FUNCTION:
 d2i_RSAPrivateKey                       750	EXIST::FUNCTION:RSA
-d2i_RSAPrivateKey_bio                   751	EXIST::FUNCTION:RSA,BIO
-d2i_RSAPrivateKey_fp                    752	EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPrivateKey_bio                   751	EXIST::FUNCTION:BIO,RSA
+d2i_RSAPrivateKey_fp                    752	EXIST::FUNCTION:RSA,FP_API
 d2i_RSAPublicKey                        753	EXIST::FUNCTION:RSA
 d2i_X509                                754	EXIST::FUNCTION:
 d2i_X509_ALGOR                          755	EXIST::FUNCTION:
@@ -843,8 +843,8 @@ i2d_PKCS7_fp                            850	EXIST::FUNCTION:FP_API
 i2d_PrivateKey                          851	EXIST::FUNCTION:
 i2d_PublicKey                           852	EXIST::FUNCTION:
 i2d_RSAPrivateKey                       853	EXIST::FUNCTION:RSA
-i2d_RSAPrivateKey_bio                   854	EXIST::FUNCTION:RSA,BIO
-i2d_RSAPrivateKey_fp                    855	EXIST::FUNCTION:FP_API,RSA
+i2d_RSAPrivateKey_bio                   854	EXIST::FUNCTION:BIO,RSA
+i2d_RSAPrivateKey_fp                    855	EXIST::FUNCTION:RSA,FP_API
 i2d_RSAPublicKey                        856	EXIST::FUNCTION:RSA
 i2d_X509                                857	EXIST::FUNCTION:
 i2d_X509_ALGOR                          858	EXIST::FUNCTION:
@@ -929,12 +929,12 @@ EVP_delete_alias                        941	NOEXIST::FUNCTION:
 EVP_mdc2                                942	EXIST::FUNCTION:MDC2
 PEM_read_bio_RSAPublicKey               943	EXIST::FUNCTION:RSA
 PEM_write_bio_RSAPublicKey              944	EXIST::FUNCTION:RSA
-d2i_RSAPublicKey_bio                    945	EXIST::FUNCTION:RSA,BIO
-i2d_RSAPublicKey_bio                    946	EXIST::FUNCTION:RSA,BIO
+d2i_RSAPublicKey_bio                    945	EXIST::FUNCTION:BIO,RSA
+i2d_RSAPublicKey_bio                    946	EXIST::FUNCTION:BIO,RSA
 PEM_read_RSAPublicKey                   947	EXIST:!WIN16:FUNCTION:RSA
 PEM_write_RSAPublicKey                  949	EXIST:!WIN16:FUNCTION:RSA
-d2i_RSAPublicKey_fp                     952	EXIST::FUNCTION:FP_API,RSA
-i2d_RSAPublicKey_fp                     954	EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPublicKey_fp                     952	EXIST::FUNCTION:RSA,FP_API
+i2d_RSAPublicKey_fp                     954	EXIST::FUNCTION:RSA,FP_API
 BIO_copy_next_retry                     955	EXIST::FUNCTION:
 RSA_flags                               956	EXIST::FUNCTION:RSA
 X509_STORE_add_crl                      957	EXIST::FUNCTION:
@@ -989,7 +989,7 @@ ERR_load_CRYPTOlib_strings              1009	EXIST:WIN16,VMS:FUNCTION:
 EVP_PKEY_bits                           1010	EXIST::FUNCTION:
 MD5_Transform                           1011	EXIST::FUNCTION:MD5
 SHA1_Transform                          1012	EXIST::FUNCTION:SHA,SHA1
-SHA_Transform                           1013	EXIST::FUNCTION:SHA,SHA0
+SHA_Transform                           1013	EXIST::FUNCTION:SHA0,SHA
 X509_STORE_CTX_get_chain                1014	EXIST::FUNCTION:
 X509_STORE_CTX_get_current_cert         1015	EXIST::FUNCTION:
 X509_STORE_CTX_get_error                1016	EXIST::FUNCTION:
@@ -1216,7 +1216,7 @@ name_cmp                                1239	EXIST::FUNCTION:
 str_dup                                 1240	NOEXIST::FUNCTION:
 i2s_ASN1_ENUMERATED                     1241	EXIST::FUNCTION:
 i2s_ASN1_ENUMERATED_TABLE               1242	EXIST::FUNCTION:
-BIO_s_log                               1243	EXIST:!WIN16,!WIN32,!macintosh:FUNCTION:
+BIO_s_log                               1243	EXIST:!WIN32,!WIN16,!macintosh:FUNCTION:
 BIO_f_reliable                          1244	EXIST::FUNCTION:BIO
 PKCS7_dataFinal                         1245	EXIST::FUNCTION:
 PKCS7_dataDecode                        1246	EXIST::FUNCTION:
@@ -1543,7 +1543,7 @@ ASN1_STRING_set_default_mask_asc        1960	EXIST:!VMS:FUNCTION:
 ASN1_STRING_set_def_mask_asc            1960	EXIST:VMS:FUNCTION:
 PEM_write_bio_RSA_PUBKEY                1961	EXIST::FUNCTION:RSA
 ASN1_INTEGER_cmp                        1963	EXIST::FUNCTION:
-d2i_RSA_PUBKEY_fp                       1964	EXIST::FUNCTION:FP_API,RSA
+d2i_RSA_PUBKEY_fp                       1964	EXIST::FUNCTION:RSA,FP_API
 X509_trust_set_bit_asc                  1967	NOEXIST::FUNCTION:
 PEM_write_bio_DSA_PUBKEY                1968	EXIST::FUNCTION:DSA
 X509_STORE_CTX_free                     1969	EXIST::FUNCTION:
@@ -1558,7 +1558,7 @@ d2i_X509_AUX                            1980	EXIST::FUNCTION:
 i2d_DSA_PUBKEY                          1981	EXIST::FUNCTION:DSA
 X509_CERT_AUX_print                     1982	EXIST::FUNCTION:BIO
 PEM_read_DSA_PUBKEY                     1984	EXIST:!WIN16:FUNCTION:DSA
-i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:RSA,BIO
+i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:BIO,RSA
 ASN1_BIT_STRING_num_asc                 1986	EXIST::FUNCTION:
 i2d_PUBKEY                              1987	EXIST::FUNCTION:
 ASN1_UTCTIME_free                       1988	EXIST::FUNCTION:
@@ -1606,7 +1606,7 @@ ASN1_IA5STRING_new                      2049	EXIST::FUNCTION:
 d2i_DSA_PUBKEY                          2050	EXIST::FUNCTION:DSA
 X509_check_purpose                      2051	EXIST::FUNCTION:
 ASN1_ENUMERATED_new                     2052	EXIST::FUNCTION:
-d2i_RSA_PUBKEY_bio                      2053	EXIST::FUNCTION:RSA,BIO
+d2i_RSA_PUBKEY_bio                      2053	EXIST::FUNCTION:BIO,RSA
 d2i_PUBKEY                              2054	EXIST::FUNCTION:
 X509_TRUST_get_trust                    2055	EXIST::FUNCTION:
 X509_TRUST_get_flags                    2056	EXIST::FUNCTION:
@@ -1646,7 +1646,7 @@ ASN1_BIT_STRING_set                     2109	EXIST::FUNCTION:
 X509_TRUST_get_count                    2110	EXIST::FUNCTION:
 ASN1_INTEGER_free                       2111	EXIST::FUNCTION:
 OTHERNAME_free                          2112	EXIST::FUNCTION:
-i2d_RSA_PUBKEY_fp                       2113	EXIST::FUNCTION:FP_API,RSA
+i2d_RSA_PUBKEY_fp                       2113	EXIST::FUNCTION:RSA,FP_API
 ASN1_INTEGER_dup                        2114	EXIST::FUNCTION:
 d2i_X509_CERT_AUX                       2115	EXIST::FUNCTION:
 PEM_write_bio_PUBKEY                    2117	EXIST::FUNCTION:
@@ -2259,7 +2259,7 @@ OCSP_RESPONSE_it                        2835	EXIST::VARIABLE:
 OCSP_CERTSTATUS_it                      2836	EXIST::VARIABLE:
 OCSP_basic_sign                         2837	EXIST::FUNCTION:
 OCSP_request_onereq_get0                2838	EXIST::FUNCTION:
-ASN1_SEQUENCE_it                        2839	EXIST::VARIABLE:
+ASN1_SEQUENCE_it                        2839	NOEXIST::FUNCTION:
 OCSP_crl_reason_str                     2840	EXIST::FUNCTION:
 OCSP_request_set1_name                  2841	EXIST::FUNCTION:
 OCSP_cert_to_id                         2842	EXIST::FUNCTION:
@@ -2273,7 +2273,7 @@ CRYPTO_get_mem_ex_functions             2849	EXIST::FUNCTION:
 OPENSSL_issetugid                       2850	EXIST::FUNCTION:
 PKCS12_item_i2d_encrypt                 2851	EXIST::FUNCTION:
 OCSP_basic_verify                       2852	EXIST::FUNCTION:
-ZLONG_it                                2853	EXIST::VARIABLE:
+ZLONG_it                                2853	NOEXIST::FUNCTION:
 EVP_aes_128_ecb                         2854	EXIST::FUNCTION:AES
 CRYPTO_set_locked_mem_ex_functions      2855	EXIST:!VMS:FUNCTION:
 CRYPTO_set_locked_mem_ex_funcs          2855	EXIST:VMS:FUNCTION:
@@ -2282,7 +2282,7 @@ DIRECTORYSTRING_it                      2857	EXIST::VARIABLE:
 PKCS12_decrypt_skey                     2858	EXIST::FUNCTION:
 EVP_aes_192_cbc                         2859	EXIST::FUNCTION:AES
 OCSP_id_get0_info                       2860	EXIST::FUNCTION:
-ASN1_FBOOLEAN_it                        2861	EXIST::VARIABLE:
+ASN1_FBOOLEAN_it                        2861	NOEXIST::FUNCTION:
 OCSP_id_issuer_cmp                      2862	EXIST::FUNCTION:
 RAND_query_egd_bytes                    2863	EXIST::FUNCTION:
 ASN1_TIME_check                         2864	EXIST::FUNCTION:
@@ -2318,11 +2318,11 @@ X509_get0_pubkey_bitstr                 2893	EXIST::FUNCTION:
 OCSP_cert_status_str                    2894	EXIST::FUNCTION:
 OCSP_sendreq_bio                        2895	EXIST::FUNCTION:
 ASN1_item_i2d_bio                       2896	EXIST::FUNCTION:BIO
-CBIGNUM_it                              2897	EXIST::VARIABLE:
+CBIGNUM_it                              2897	NOEXIST::FUNCTION:
 PKCS8_decrypt                           2898	EXIST::FUNCTION:
 rijndaelKeySetupEnc                     2899	EXIST::FUNCTION:
 OCSP_basic_add1_cert                    2900	EXIST::FUNCTION:
-LONG_it                                 2901	EXIST::VARIABLE:
+LONG_it                                 2901	NOEXIST::FUNCTION:
 PKCS12_certbag2x509                     2902	EXIST::FUNCTION:
 OCSP_response_create                    2903	EXIST::FUNCTION:
 OCSP_resp_get0                          2904	EXIST::FUNCTION:
@@ -2332,16 +2332,17 @@ EVP_aes_192_ecb                         2906	EXIST::FUNCTION:AES
 OCSP_response_get1_basic                2907	EXIST::FUNCTION:
 PKCS12_item_pack_safebag                2908	EXIST::FUNCTION:
 OCSP_copy_nonce                         2909	EXIST::FUNCTION:
-ASN1_TBOOLEAN_it                        2910	EXIST::VARIABLE:
+ASN1_TBOOLEAN_it                        2910	NOEXIST::FUNCTION:
 OCSP_single_get0_status                 2911	EXIST::FUNCTION:
 OCSP_check_nonce                        2912	EXIST::FUNCTION:
-ASN1_BOOLEAN_it                         2913	EXIST::VARIABLE:
+ASN1_BOOLEAN_it                         2913	NOEXIST::FUNCTION:
 RSAPublicKey_it                         2914	EXIST::VARIABLE:RSA
 ASN1_PRINTABLE_free                     2915	EXIST::FUNCTION:
 CRYPTO_set_mem_ex_functions             2916	EXIST::FUNCTION:
 ASN1_TIME_to_generalizedtime            2917	EXIST::FUNCTION:
-BIGNUM_it                               2918	EXIST::VARIABLE:
+BIGNUM_it                               2918	NOEXIST::FUNCTION:
 OCSP_onereq_get0_id                     2919	EXIST::FUNCTION:
 EVP_aes_256_cbc                         2920	EXIST::FUNCTION:AES
 OCSP_resp_find                          2921	EXIST::FUNCTION:
 BN_rand_range                           2922	EXIST::FUNCTION:
+OCSP_check_validity                     2923	EXIST::FUNCTION:
diff --git a/util/ssleay.num b/util/ssleay.num
index 5d3549c827..c335f90124 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -211,3 +211,4 @@ kssl_ctx_setstring                      260	EXIST::FUNCTION:KRB5
 SSL_CTX_has_matching_session_id         261	EXIST::FUNCTION:
 SSL_set_generate_session_id             262	EXIST::FUNCTION:
 SSL_CTX_set_generate_session_id         263	EXIST::FUNCTION:
+SSL_has_matching_session_id             264	EXIST::FUNCTION: