[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qca/plugins/qca-gcrypt
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2006-10-15 6:01:34
Message-ID: 1160892094.593456.14064.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 595614 by bhards:

The development versions (SVN trunk) of libgcrypt
now has OFB support. This won't be released until 1.3.0.

Also, the fixes for SHA2 (i.e. SHA384/SHA512) didn't make
it into libgcrypt-1.2.3 for reasons that I don't understand,
but in any case, we need to manage that here.


 M  +23 -2     qca-gcrypt.cpp  


--- trunk/kdesupport/qca/plugins/qca-gcrypt/qca-gcrypt.cpp #595613:595614
@@ -443,8 +443,8 @@
 	list += "hmac(sha224)";
 #endif
 	list += "hmac(sha256)";
-	if ( ! ( NULL == gcry_check_version("1.2.3") ) ) {
-	    // 1.2.2 and earlier have broken implementation
+	if ( ! ( NULL == gcry_check_version("1.3.0") ) ) {
+	    // 1.2 and earlier have broken implementation
 	    list += "hmac(sha384)";
 	    list += "hmac(sha512)";
 	}
@@ -465,6 +465,15 @@
 	list += "des-ecb";
 	list += "des-cbc";
 	list += "des-cfb";
+	if ( ! ( NULL == gcry_check_version("1.3.0") ) ) {
+	    // 1.2 branch and earlier doesn't support OFB mode
+	    list += "aes128-ofb";
+	    list += "aes192-ofb";
+	    list += "aes256-ofb";
+	    list += "des-ofb";
+	    list += "tripledes-ofb";
+	    list += "blowfish-ofb";
+	}
 	list += "pbkdf1(sha1)";
 	list += "pbkdf2(sha1)";
 	return list;
@@ -511,18 +520,24 @@
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES128, \
GCRY_CIPHER_MODE_ECB, false, this, type );  else if ( type == "aes128-cfb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES128, \
GCRY_CIPHER_MODE_CFB, false, this, type ); +	else if ( type == "aes128-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES128, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "aes128-cbc" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES128, \
GCRY_CIPHER_MODE_CBC, false, this, type );  else if ( type == "aes192-ecb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES192, \
GCRY_CIPHER_MODE_ECB, false, this, type );  else if ( type == "aes192-cfb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES192, \
GCRY_CIPHER_MODE_CFB, false, this, type ); +	else if ( type == "aes192-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES192, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "aes192-cbc" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES192, \
GCRY_CIPHER_MODE_CBC, false, this, type );  else if ( type == "aes256-ecb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES256, \
GCRY_CIPHER_MODE_ECB, false, this, type );  else if ( type == "aes256-cfb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES256, \
GCRY_CIPHER_MODE_CFB, false, this, type ); +	else if ( type == "aes256-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES256, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "aes256-cbc" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_AES256, \
GCRY_CIPHER_MODE_CBC, false, this, type );  else if ( type == "blowfish-ecb" )
@@ -531,14 +546,20 @@
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_BLOWFISH, \
GCRY_CIPHER_MODE_CBC, false, this, type );  else if ( type == "blowfish-cfb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_BLOWFISH, \
GCRY_CIPHER_MODE_CFB, false, this, type ); +	else if ( type == "blowfish-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_BLOWFISH, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "tripledes-ecb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_3DES, \
GCRY_CIPHER_MODE_ECB, false, this, type ); +	else if ( type == "tripledes-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_3DES, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "des-ecb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_DES, \
GCRY_CIPHER_MODE_ECB, false, this, type );  else if ( type == "des-cbc" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_DES, \
GCRY_CIPHER_MODE_CBC, false, this, type );  else if ( type == "des-cfb" )
 	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_DES, \
GCRY_CIPHER_MODE_CFB, false, this, type ); +	else if ( type == "des-ofb" )
+	    return new gcryptQCAPlugin::gcryCipherContext( GCRY_CIPHER_DES, \
GCRY_CIPHER_MODE_OFB, false, this, type );  else if ( type == "pbkdf1(sha1)" )
 	    return new gcryptQCAPlugin::pbkdf1Context( GCRY_MD_SHA1, this, type );
 	else if ( type == "pbkdf2(sha1)" )


[prev in list] [next in list] [prev in thread] [next in thread]