Windows-specific addenum to "engage crypto/modes" commit #17716.

diff --git a/crypto/aes/aes.h b/crypto/aes/aes.h
index 35e6be0025ef33d14117abc97cab0a9045f3539d..d2c99730fec5f3d2d6c9675bad5807274f55daca 100644 (file)
--- a/crypto/aes/aes.h
+++ b/crypto/aes/aes.h
@@ -109,9 +109,6 @@ void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
 void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
        size_t length, const AES_KEY *key,
        unsigned char *ivec, int *num, const int enc);
-void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
-                           const int nbits,const AES_KEY *key,
-                           unsigned char *ivec,const int enc);
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
        size_t length, const AES_KEY *key,
        unsigned char *ivec, int *num);

diff --git a/crypto/camellia/camellia.h b/crypto/camellia/camellia.h
index 055a25582c449d3217f8b4b95f3b5cd7eefcfde1..cf0457dd976f80b9e582266b04d75db35f9d2929 100644 (file)
--- a/crypto/camellia/camellia.h
+++ b/crypto/camellia/camellia.h
@@ -110,9 +110,6 @@ void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
 void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
        size_t length, const CAMELLIA_KEY *key,
        unsigned char *ivec, int *num, const int enc);
-void Camellia_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
-       const int nbits,const CAMELLIA_KEY *key,
-       unsigned char *ivec,const int enc);
 void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
        size_t length, const CAMELLIA_KEY *key,
        unsigned char *ivec, int *num);

diff --git a/util/libeay.num b/util/libeay.num
index aa3d66dcaca14d363e74729ffdf34c99e24b2bf2..90a77aec69a0c8eb71f699580d2f83690b3fc3ab 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2815,7 +2815,7 @@ FIPS_allow_md5                          3256      NOEXIST::FUNCTION:
 DES_ede3_cfb_encrypt                    3257   EXIST::FUNCTION:DES
 EVP_des_ede3_cfb8                       3258   EXIST::FUNCTION:DES
 FIPS_rand_seeded                        3259   NOEXIST::FUNCTION:
-AES_cfbr_encrypt_block                  3260   EXIST::FUNCTION:AES
+AES_cfbr_encrypt_block                  3260   NOEXIST::FUNCTION:AES
 AES_cfb8_encrypt                        3261   EXIST::FUNCTION:AES
 FIPS_rand_seed                          3262   NOEXIST::FUNCTION:
 FIPS_corrupt_des                        3263   NOEXIST::FUNCTION:
@@ -3385,7 +3385,7 @@ Camellia_cfb128_encrypt                 3785      EXIST::FUNCTION:CAMELLIA
 Camellia_cfb1_encrypt                   3786   EXIST::FUNCTION:CAMELLIA
 Camellia_cfb8_encrypt                   3787   EXIST::FUNCTION:CAMELLIA
 Camellia_ctr128_encrypt                 3788   EXIST::FUNCTION:CAMELLIA
-Camellia_cfbr_encrypt_block             3789   EXIST::FUNCTION:CAMELLIA
+Camellia_cfbr_encrypt_block             3789   NOEXIST::FUNCTION:CAMELLIA
 Camellia_decrypt                        3790   EXIST::FUNCTION:CAMELLIA
 Camellia_ecb_encrypt                    3791   EXIST::FUNCTION:CAMELLIA
 Camellia_encrypt                        3792   EXIST::FUNCTION:CAMELLIA

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 853f69c0eb00819287c1006f19a4629f3e2738cc..6d158314509f1279ebf4cce8c09f4d0a11690634 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -26,6 +26,7 @@ my @dirs = (
 "crypto/aes",
 "crypto/camellia",
 "crypto/seed",
+"crypto/modes",
 "crypto/bn",
 "crypto/rsa",
 "crypto/dsa",