[SCM] QCA2 OpenSSL plugin packaging branch, master, updated. debian/0.1-20070904-3-18-g53fea5d

[Felix Geyer]

The following commit has been merged in the master branch:
commit 42c959d2c3cff52fbc315797b3862cc42bbd82b7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 30 01:01:30 2011 +0200

    Enable support for MD2 only when available in OpenSSL.
    
    Closes: #622017
---
 debian/changelog                         |    2 +
 debian/patches/detect_md2_available.diff |  106 ++++++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 109 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8857f17..37c5825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qca2-plugin-ossl (2.0.0~beta3-1) UNRELEASED; urgency=low
     - Turn changes from the last revision into a proper patch:
       remove_whirlpool_algo.diff
   * Switch debian/rules engine to dhmk.
+  * Enable support for MD2 only when available in OpenSSL. (Closes: #622017)
+    - Add detect_md2_available.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 23:15:26 +0200
 
diff --git a/debian/patches/detect_md2_available.diff b/debian/patches/detect_md2_available.diff
new file mode 100644
index 0000000..aca36d8
--- /dev/null
+++ b/debian/patches/detect_md2_available.diff
@@ -0,0 +1,106 @@
+Description: Detect whether MD2 is avalable for OpenSSL plugin.
+Origin: upstream, http://websvn.kde.org/?view=revision&revision=1111902 and
+ http://websvn.kde.org/?view=revision&revision=1115936
+
+--- qca-ossl/qca-ossl.cpp
++++ qca-ossl/qca-ossl.cpp
+@@ -1771,8 +1771,10 @@
+ 			md = EVP_sha1();
+ 		else if(alg == EMSA3_MD5)
+ 			md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ 		else if(alg == EMSA3_MD2)
+ 			md = EVP_md2();
++#endif
+ 		else if(alg == EMSA3_RIPEMD160)
+ 			md = EVP_ripemd160();
+ 		else if(alg == EMSA3_Raw)
+@@ -1789,8 +1791,10 @@
+ 			md = EVP_sha1();
+ 		else if(alg == EMSA3_MD5)
+ 			md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ 		else if(alg == EMSA3_MD2)
+ 			md = EVP_md2();
++#endif
+ 		else if(alg == EMSA3_RIPEMD160)
+ 			md = EVP_ripemd160();
+ 		else if(alg == EMSA3_Raw)
+@@ -3412,9 +3416,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -3910,9 +3916,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -4100,9 +4108,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -6640,7 +6650,9 @@
+ 	list += "sha1";
+ 	list += "sha0";
+ 	list += "ripemd160";
++#ifdef HAVE_OPENSSL_MD2
+ 	list += "md2";
++#endif
+ 	list += "md4";
+ 	list += "md5";
+ #ifdef SHA224_DIGEST_LENGTH
+@@ -6849,7 +6861,9 @@
+ 		list += all_hash_types();
+ 		list += all_mac_types();
+ 		list += all_cipher_types();
++#ifdef HAVE_OPENSSL_MD2
+ 		list += "pbkdf1(md2)";
++#endif
+ 		list += "pbkdf1(sha1)";
+ 		list += "pbkdf2(sha1)";
+ 		list += "pkey";
+@@ -6882,8 +6896,10 @@
+ 			return new opensslHashContext( EVP_sha(), this, type);
+ 		else if ( type == "ripemd160" )
+ 			return new opensslHashContext( EVP_ripemd160(), this, type);
++#ifdef HAVE_OPENSSL_MD2
+ 		else if ( type == "md2" )
+ 			return new opensslHashContext( EVP_md2(), this, type);
++#endif
+ 		else if ( type == "md4" )
+ 			return new opensslHashContext( EVP_md4(), this, type);
+ 		else if ( type == "md5" )
+@@ -6912,8 +6928,10 @@
+ */
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
++#ifdef HAVE_OPENSSL_MD2
+ 		else if ( type == "pbkdf1(md2)" )
+ 			return new opensslPbkdf1Context( EVP_md2(), this, type );
++#endif
+ 		else if ( type == "pbkdf2(sha1)" )
+ 			return new opensslPbkdf2Context( this, type );
+ 		else if ( type == "hmac(md5)" )
diff --git a/debian/patches/series b/debian/patches/series
index 01254e5..75f2308 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_whirlpool_algo.diff
+detect_md2_available.diff

-- 
QCA2 OpenSSL plugin packaging