Several of the EVP_CIPHER structures had the get and set asn1 parameter

functions transposed.

diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c
index 9b95554413cebd173229becb9ab3683c17231ca5..3c16f5a4e04c04a14fc028527181b34a2d904adf 100644 (file)
--- a/crypto/evp/e_cbc_3d.c
+++ b/crypto/evp/e_cbc_3d.c
@@ -77,8 +77,8 @@ static EVP_CIPHER d_cbc_ede_cipher2=
        NULL,
        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
-       EVP_CIPHER_get_asn1_iv,
        EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 static EVP_CIPHER d_cbc_ede_cipher3=

diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c
index a55b8426671a01c7af0373ff038b971baaf8c919..9bcba3c516bbea57297dc9e7de0dfb665655f399 100644 (file)
--- a/crypto/evp/e_cbc_bf.c
+++ b/crypto/evp/e_cbc_bf.c
@@ -75,8 +75,8 @@ static EVP_CIPHER bfish_cbc_cipher=
        NULL,
        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
-       EVP_CIPHER_get_asn1_iv,
        EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 EVP_CIPHER *EVP_bf_cbc(void)

diff --git a/crypto/evp/e_cbc_c.c b/crypto/evp/e_cbc_c.c
index 04a2508c18d611c99a32023e90a4fc12fabeab20..6845b0b44c91038fd74d35cc59759a47e2e97034 100644 (file)
--- a/crypto/evp/e_cbc_c.c
+++ b/crypto/evp/e_cbc_c.c
@@ -76,8 +76,8 @@ static EVP_CIPHER cast5_cbc_cipher=
        NULL,
        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
-       EVP_CIPHER_get_asn1_iv,
        EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 EVP_CIPHER *EVP_cast5_cbc(void)

diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c
index 1507dbb68a157de71af4d4434b63778fbd2aacab..f394fa4806fe4575dd59f36963ad0374ee2f11a5 100644 (file)
--- a/crypto/evp/e_cbc_d.c
+++ b/crypto/evp/e_cbc_d.c
@@ -75,8 +75,8 @@ static EVP_CIPHER d_cbc_cipher=
        NULL,
        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
-       EVP_CIPHER_get_asn1_iv,
        EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 EVP_CIPHER *EVP_des_cbc(void)

diff --git a/crypto/evp/e_cbc_i.c b/crypto/evp/e_cbc_i.c
index 5e5b47d0e2492b7361f76b68842a0d0432d41763..34b44aa21f1b5da05376ade38f500a2644c2ed42 100644 (file)
--- a/crypto/evp/e_cbc_i.c
+++ b/crypto/evp/e_cbc_i.c
@@ -76,8 +76,8 @@ static EVP_CIPHER i_cbc_cipher=
        NULL,
        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
-       EVP_CIPHER_get_asn1_iv,
        EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 EVP_CIPHER *EVP_idea_cbc(void)