All EVP_*_cfb functions have changed names to EVP_*_cfb64 or

EVP_*_cfb128.

diff --git a/util/libeay.num b/util/libeay.num
index 6a3e1d3059d85f583f0becd09fbf288fff135584..6630d0ba8e5fcf0507cdb78399323be14f0d46ae 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -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    NOEXIST::FUNCTION:
+EVP_bf_cfb64                            295    EXIST::FUNCTION:BF
 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    NOEXIST::FUNCTION:
+EVP_des_cfb64                           300    EXIST::FUNCTION:DES
 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    NOEXIST::FUNCTION:
+EVP_des_ede3_cfb64                      305    EXIST::FUNCTION:DES
 EVP_des_ede3_ofb                        306    EXIST::FUNCTION:DES
 EVP_des_ede_cbc                         307    EXIST::FUNCTION:DES
-EVP_des_ede_cfb                         308    NOEXIST::FUNCTION:
+EVP_des_ede_cfb64                       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
@@ -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    NOEXIST::FUNCTION:
+EVP_idea_cfb64                          319    EXIST::FUNCTION:IDEA
 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    NOEXIST::FUNCTION:
+EVP_rc2_cfb64                           326    EXIST::FUNCTION:RC2
 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    NOEXIST::FUNCTION:
+EVP_cast5_cfb64                         984    EXIST::FUNCTION:CAST
 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   NOEXIST::FUNCTION:
+EVP_rc5_32_12_16_cfb64                  1088   EXIST::FUNCTION:RC5
 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   NOEXIST::FUNCTION:
-EVP_aes_256_cfb                         3223   NOEXIST::FUNCTION:
+EVP_aes_128_cfb128                      3222   EXIST::FUNCTION:AES
+EVP_aes_256_cfb128                      3223   EXIST::FUNCTION:AES
 EVP_aes_128_ofb                         3224   EXIST::FUNCTION:AES
-EVP_aes_192_cfb                         3225   NOEXIST::FUNCTION:
+EVP_aes_192_cfb128                      3225   EXIST::FUNCTION:AES
 CONF_modules_free                       3226   EXIST::FUNCTION:
 NCONF_default                           3227   EXIST::FUNCTION:
 OPENSSL_no_config                       3228   EXIST::FUNCTION:
@@ -2803,47 +2803,36 @@ OpenSSLDie                              3244    EXIST::FUNCTION:
 OPENSSL_cleanse                         3245   EXIST::FUNCTION:
 ENGINE_setup_bsd_cryptodev              3246   EXIST:__FreeBSD__:FUNCTION:ENGINE
 ERR_release_err_state_table             3247   EXIST::FUNCTION:LHASH
-EVP_cast5_cfb64                         3248   EXIST::FUNCTION:CAST
-EVP_aes_128_cfb8                        3249   EXIST::FUNCTION:AES
-EVP_aes_256_cfb128                      3250   EXIST::FUNCTION:AES
-EVP_des_ede3_cfb64                      3251   EXIST::FUNCTION:DES
-EVP_aes_128_cfb1                        3252   EXIST::FUNCTION:AES
-EVP_aes_192_cfb8                        3253   EXIST::FUNCTION:AES
-EVP_des_cfb64                           3254   EXIST::FUNCTION:DES
-EVP_rc2_cfb64                           3255   EXIST::FUNCTION:RC2
-EVP_aes_256_cfb8                        3256   EXIST::FUNCTION:AES
+EVP_aes_128_cfb8                        3248   EXIST::FUNCTION:AES
+FIPS_corrupt_rsa                        3249   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_des                       3250   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_128_cfb1                        3251   EXIST::FUNCTION:AES
+EVP_aes_192_cfb8                        3252   EXIST::FUNCTION:AES
+FIPS_mode_set                           3253   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_dsa                       3254   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_256_cfb8                        3255   EXIST::FUNCTION:AES
+FIPS_allow_md5                          3256   EXIST:OPENSSL_FIPS:FUNCTION:
 DES_ede3_cfb_encrypt                    3257   EXIST::FUNCTION:DES
-EVP_aes_128_cfb128                      3258   EXIST::FUNCTION:AES
-EVP_bf_cfb64                            3259   EXIST::FUNCTION:BF
-EVP_des_ede3_cfb8                       3260   EXIST::FUNCTION:DES
-AES_cfbr_encrypt_block                  3261   EXIST::FUNCTION:AES
-AES_cfb8_encrypt                        3262   EXIST::FUNCTION:AES
-EVP_des_ede_cfb64                       3263   EXIST::FUNCTION:DES
-EVP_aes_192_cfb128                      3264   EXIST::FUNCTION:AES
-EVP_aes_192_cfb1                        3265   EXIST::FUNCTION:AES
-EVP_des_cfb8                            3266   EXIST::FUNCTION:DES
-EVP_aes_256_cfb1                        3267   EXIST::FUNCTION:AES
-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
-FIPS_corrupt_rsa                        3273   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_des                       3274   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_mode_set                           3275   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_dsa                       3276   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_allow_md5                          3277   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_des                        3278   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_aes                       3279   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_dsa                        3280   EXIST:OPENSSL_FIPS:FUNCTION:
-ERR_load_FIPS_strings                   3281   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_aes                        3282   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_sha1                      3283   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_rsa                       3284   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_sha1                       3285   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_check                          3286   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_seeded                        3287   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_seed                          3288   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_set_prng_key                       3289   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_test_mode                          3290   EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_method                        3291   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_des_ede3_cfb8                       3258   EXIST::FUNCTION:DES
+FIPS_rand_seeded                        3259   EXIST:OPENSSL_FIPS:FUNCTION:
+AES_cfbr_encrypt_block                  3260   EXIST::FUNCTION:AES
+AES_cfb8_encrypt                        3261   EXIST::FUNCTION:AES
+FIPS_rand_seed                          3262   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_des                        3263   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_192_cfb1                        3264   EXIST::FUNCTION:AES
+FIPS_selftest_aes                       3265   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_set_prng_key                       3266   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_des_cfb8                            3267   EXIST::FUNCTION:DES
+FIPS_corrupt_dsa                        3268   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_test_mode                          3269   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_method                        3270   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_256_cfb1                        3271   EXIST::FUNCTION:AES
+ERR_load_FIPS_strings                   3272   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_aes                        3273   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_sha1                      3274   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_rsa                       3275   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_sha1                       3276   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_des_cfb1                            3277   EXIST::FUNCTION:DES
+FIPS_dsa_check                          3278   EXIST:OPENSSL_FIPS:FUNCTION:
+AES_cfb1_encrypt                        3279   EXIST::FUNCTION:AES
+EVP_des_ede3_cfb1                       3280   EXIST::FUNCTION:DES