make update

perl util/mkdef.pl crypto update rewrite

diff --git a/util/libeay.num b/util/libeay.num
index 7e4b71b10813530cf3c113c50c5e17c72bca74f2..651c85fcb65997ab9576824e0e14b3f26387b659 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -197,7 +197,7 @@ 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
-DHparams_print_fp                       208    EXIST::FUNCTION:DH,FP_API
+DHparams_print_fp                       208    EXIST::FUNCTION:FP_API,DH
 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:DSA,SHA
-EVP_dss1                                313    EXIST::FUNCTION:DSA,SHA
+EVP_dss                                 312    EXIST::FUNCTION:SHA,DSA
+EVP_dss1                                313    EXIST::FUNCTION:SHA,DSA
 EVP_enc_null                            314    EXIST::FUNCTION:
 EVP_get_cipherbyname                    315    EXIST::FUNCTION:
 EVP_get_digestbyname                    316    EXIST::FUNCTION:
@@ -478,7 +478,7 @@ 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
-RSA_print_fp                            489    EXIST::FUNCTION:RSA,FP_API
+RSA_print_fp                            489    EXIST::FUNCTION:FP_API,RSA
 RSA_private_decrypt                     490    EXIST::FUNCTION:RSA
 RSA_private_encrypt                     491    EXIST::FUNCTION:RSA
 RSA_public_decrypt                      492    EXIST::FUNCTION:RSA
@@ -742,7 +742,7 @@ d2i_PrivateKey                          748 EXIST::FUNCTION:
 d2i_PublicKey                           749    EXIST::FUNCTION:
 d2i_RSAPrivateKey                       750    EXIST::FUNCTION:RSA
 d2i_RSAPrivateKey_bio                   751    EXIST::FUNCTION:RSA
-d2i_RSAPrivateKey_fp                    752    EXIST::FUNCTION:RSA,FP_API
+d2i_RSAPrivateKey_fp                    752    EXIST::FUNCTION:FP_API,RSA
 d2i_RSAPublicKey                        753    EXIST::FUNCTION:RSA
 d2i_X509                                754    EXIST::FUNCTION:
 d2i_X509_ALGOR                          755    EXIST::FUNCTION:
@@ -844,7 +844,7 @@ i2d_PrivateKey                          851 EXIST::FUNCTION:
 i2d_PublicKey                           852    EXIST::FUNCTION:
 i2d_RSAPrivateKey                       853    EXIST::FUNCTION:RSA
 i2d_RSAPrivateKey_bio                   854    EXIST::FUNCTION:RSA
-i2d_RSAPrivateKey_fp                    855    EXIST::FUNCTION:RSA,FP_API
+i2d_RSAPrivateKey_fp                    855    EXIST::FUNCTION:FP_API,RSA
 i2d_RSAPublicKey                        856    EXIST::FUNCTION:RSA
 i2d_X509                                857    EXIST::FUNCTION:
 i2d_X509_ALGOR                          858    EXIST::FUNCTION:
@@ -933,8 +933,8 @@ d2i_RSAPublicKey_bio                    945 EXIST::FUNCTION:RSA
 i2d_RSAPublicKey_bio                    946    EXIST::FUNCTION:RSA
 PEM_read_RSAPublicKey                   947    EXIST:!WIN16:FUNCTION:RSA
 PEM_write_RSAPublicKey                  949    EXIST:!WIN16:FUNCTION:RSA
-d2i_RSAPublicKey_fp                     952    EXIST::FUNCTION:RSA,FP_API
-i2d_RSAPublicKey_fp                     954    EXIST::FUNCTION:RSA,FP_API
+d2i_RSAPublicKey_fp                     952    EXIST::FUNCTION:FP_API,RSA
+i2d_RSAPublicKey_fp                     954    EXIST::FUNCTION:FP_API,RSA
 BIO_copy_next_retry                     955    EXIST::FUNCTION:
 RSA_flags                               956    EXIST::FUNCTION:RSA
 X509_STORE_add_crl                      957    EXIST::FUNCTION:
@@ -1212,7 +1212,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:!WIN32,!WIN16,!macintosh:FUNCTION:
+BIO_s_log                               1243   EXIST:!WIN16,!WIN32,!macintosh:FUNCTION:
 BIO_f_reliable                          1244   EXIST::FUNCTION:
 PKCS7_dataFinal                         1245   EXIST::FUNCTION:
 PKCS7_dataDecode                        1246   EXIST::FUNCTION:
@@ -1535,7 +1535,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:RSA,FP_API
+d2i_RSA_PUBKEY_fp                       1964   EXIST::FUNCTION:FP_API,RSA
 X509_trust_set_bit_asc                  1967   NOEXIST::FUNCTION:
 PEM_write_bio_DSA_PUBKEY                1968   EXIST::FUNCTION:
 X509_STORE_CTX_free                     1969   EXIST::FUNCTION:
@@ -1638,7 +1638,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:RSA,FP_API
+i2d_RSA_PUBKEY_fp                       2113   EXIST::FUNCTION:FP_API,RSA
 ASN1_INTEGER_dup                        2114   EXIST::FUNCTION:
 d2i_X509_CERT_AUX                       2115   EXIST::FUNCTION:
 PEM_write_bio_PUBKEY                    2117   EXIST::FUNCTION: