diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-30 20:07:04 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-30 20:07:04 +0000 |
commit | 36183f83dc4dd26ddb8c060e2f2c5bef13039632 (patch) | |
tree | 0d6d2e71e65deceb2010bce8baebe4caca656eb4 /package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch | |
parent | 35082b76a007061c3c0dd52654e6dbbfcd332247 (diff) |
polarssl: add from /packages, update to 1.2.4, fix openssl compatibility
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch')
-rw-r--r-- | package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch b/package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch new file mode 100644 index 000000000..6ca43c312 --- /dev/null +++ b/package/libs/polarssl/patches/300-openssl_cipher_name_compat.patch @@ -0,0 +1,53 @@ +--- a/library/cipher.c ++++ b/library/cipher.c +@@ -279,15 +279,21 @@ const cipher_info_t *cipher_info_from_st + #if defined(POLARSSL_BLOWFISH_C) + if( !strcasecmp( "BLOWFISH-CBC", cipher_name ) ) + return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CBC ); ++ if( !strcasecmp( "BF-CBC", cipher_name ) ) ++ return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CBC ); + + #if defined(POLARSSL_CIPHER_MODE_CFB) + if( !strcasecmp( "BLOWFISH-CFB64", cipher_name ) ) + return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CFB64 ); ++ if( !strcasecmp( "BF-CFB64", cipher_name ) ) ++ return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CFB64 ); + #endif /* defined(POLARSSL_CIPHER_MODE_CFB) */ + + #if defined(POLARSSL_CIPHER_MODE_CTR) + if( !strcasecmp( "BLOWFISH-CTR", cipher_name ) ) + return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CTR ); ++ if( !strcasecmp( "BF-CTR", cipher_name ) ) ++ return cipher_info_from_type( POLARSSL_CIPHER_BLOWFISH_CTR ); + #endif /* defined(POLARSSL_CIPHER_MODE_CTR) */ + #endif + +--- a/library/cipher_wrap.c ++++ b/library/cipher_wrap.c +@@ -643,7 +643,7 @@ const cipher_info_t blowfish_cbc_info = + POLARSSL_CIPHER_BLOWFISH_CBC, + POLARSSL_MODE_CBC, + 32, +- "BLOWFISH-CBC", ++ "BF-CBC", + 8, + 8, + &blowfish_info +@@ -654,7 +654,7 @@ const cipher_info_t blowfish_cfb64_info + POLARSSL_CIPHER_BLOWFISH_CFB64, + POLARSSL_MODE_CFB, + 32, +- "BLOWFISH-CFB64", ++ "BF-CFB64", + 8, + 8, + &blowfish_info +@@ -666,7 +666,7 @@ const cipher_info_t blowfish_ctr_info = + POLARSSL_CIPHER_BLOWFISH_CTR, + POLARSSL_MODE_CTR, + 32, +- "BLOWFISH-CTR", ++ "BF-CTR", + 8, + 8, + &blowfish_info |