fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2015-02-19 20:20 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/hbssl/evpciph.c
  * contrib/hbssl/hbssl.h
    ! added missing protection for EVP_rc5_32_12_16_cfb64()
    * cleaned version macro usage to not force final versions until beta
      ones is not confirmed to be broken
This commit is contained in:
Przemysław Czerpak
2015-02-19 20:20:34 +01:00
parent bae69e6ead
commit f27109beee
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-02-19 20:20 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbssl/evpciph.c
* contrib/hbssl/hbssl.h
! added missing protection for EVP_rc5_32_12_16_cfb64()
* cleaned version macro usage to not force final versions until beta
ones is not confirmed to be broken
2015-02-19 19:42 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbssl/bio.c
* contrib/hbssl/err.c

4
contrib/hbssl/evpciph.c
View File

@@ -182,8 +182,10 @@ const EVP_CIPHER * hb_EVP_CIPHER_par( int iParam )
case HB_EVP_CIPHER_RC5_32_12_16_ECB: p = EVP_rc5_32_12_16_ecb(); break;
case HB_EVP_CIPHER_RC5_32_12_16_CFB: p = EVP_rc5_32_12_16_cfb(); break;
case HB_EVP_CIPHER_RC5_32_12_16_OFB: p = EVP_rc5_32_12_16_ofb(); break;
#if OPENSSL_VERSION_NUMBER >= 0x00907050L
case HB_EVP_CIPHER_RC5_32_12_16_CFB64: p = EVP_rc5_32_12_16_cfb64(); break;
#endif
#endif
#ifndef OPENSSL_NO_AES
case HB_EVP_CIPHER_AES_128_ECB: p = EVP_aes_128_ecb(); break;
case HB_EVP_CIPHER_AES_128_CBC: p = EVP_aes_128_cbc(); break;
@@ -325,7 +327,9 @@ static int hb_EVP_CIPHER_ptr_to_id( const EVP_CIPHER * p )
#ifndef OPENSSL_NO_RC5
else if( p == EVP_rc5_32_12_16_cbc() ) n = HB_EVP_CIPHER_RC5_32_12_16_CBC;
else if( p == EVP_rc5_32_12_16_ecb() ) n = HB_EVP_CIPHER_RC5_32_12_16_ECB;
#if OPENSSL_VERSION_NUMBER >= 0x00907050L
else if( p == EVP_rc5_32_12_16_cfb64() ) n = HB_EVP_CIPHER_RC5_32_12_16_CFB64;
#endif
else if( p == EVP_rc5_32_12_16_cfb() ) n = HB_EVP_CIPHER_RC5_32_12_16_CFB;
else if( p == EVP_rc5_32_12_16_ofb() ) n = HB_EVP_CIPHER_RC5_32_12_16_OFB;
#endif

8
contrib/hbssl/hbssl.h
View File

@@ -65,17 +65,17 @@
/* #error "unsupported OpenSSL version, required 0.9.6 or higher" */
#endif
#if OPENSSL_VERSION_NUMBER < 0x0090806fL
#if OPENSSL_VERSION_NUMBER < 0x00908060L
#ifndef OPENSSL_NO_SEED
#define OPENSSL_NO_SEED
#endif
#endif
#if OPENSSL_VERSION_NUMBER < 0x0090803fL
#if OPENSSL_VERSION_NUMBER < 0x00908030L
#ifndef OPENSSL_NO_CAMELLIA
#define OPENSSL_NO_CAMELLIA
#endif
#endif
#if OPENSSL_VERSION_NUMBER < 0x0090800fL
#if OPENSSL_VERSION_NUMBER < 0x00908000L
#ifndef OPENSSL_NO_DGRAM
#define OPENSSL_NO_DGRAM
#endif
@@ -143,7 +143,7 @@
#endif
#if OPENSSL_VERSION_NUMBER < 0x00908000L
#if OPENSSL_VERSION_NUMBER < 0x0090708fL || ! defined( OPENSSL_FIPS )
#if OPENSSL_VERSION_NUMBER < 0x00907080L || ! defined( OPENSSL_FIPS )
#ifndef OPENSSL_NO_SHA256
#define OPENSSL_NO_SHA256
#endif