[69823] trunk/dports/devel/qca-ossl/files/patch-qca-ossl.cpp.diff

[michaelld at macports.org]

Revision: 69823
          http://trac.macports.org/changeset/69823
Author:   michaelld at macports.org
Date:     2010-07-17 06:36:25 -0700 (Sat, 17 Jul 2010)
Log Message:
-----------
Added forgotten patchfile.

Added Paths:
-----------
    trunk/dports/devel/qca-ossl/files/patch-qca-ossl.cpp.diff

Added: trunk/dports/devel/qca-ossl/files/patch-qca-ossl.cpp.diff
===================================================================
--- trunk/dports/devel/qca-ossl/files/patch-qca-ossl.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/qca-ossl/files/patch-qca-ossl.cpp.diff	2010-07-17 13:36:25 UTC (rev 69823)
@@ -0,0 +1,102 @@
+--- qca-ossl.cpp.orig	2010-07-14 13:42:37.000000000 -0600
++++ qca-ossl.cpp	2010-07-14 13:44:50.000000000 -0600
+@@ -1771,8 +1771,10 @@
+ 			md = EVP_sha1();
+ 		else if(alg == EMSA3_MD5)
+ 			md = EVP_md5();
++#ifndef OPENSSL_NO_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();
++#ifndef OPENSSL_NO_MD2
+ 		else if(alg == EMSA3_MD2)
+ 			md = EVP_md2();
++#endif
+ 		else if(alg == EMSA3_RIPEMD160)
+ 			md = EVP_ripemd160();
+ 		else if(alg == EMSA3_Raw)
+@@ -3385,9 +3389,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifndef OPENSSL_NO_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -3871,9 +3877,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifndef OPENSSL_NO_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -4061,9 +4069,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifndef OPENSSL_NO_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -6582,7 +6592,9 @@
+ 	list += "sha1";
+ 	list += "sha0";
+ 	list += "ripemd160";
++#ifndef OPENSSL_NO_MD2
+ 	list += "md2";
++#endif
+ 	list += "md4";
+ 	list += "md5";
+ #ifdef SHA224_DIGEST_LENGTH
+@@ -6757,7 +6769,9 @@
+ 		list += all_hash_types();
+ 		list += all_mac_types();
+ 		list += all_cipher_types();
++#ifndef OPENSSL_NO_MD2
+ 		list += "pbkdf1(md2)";
++#endif
+ 		list += "pbkdf1(sha1)";
+ 		list += "pbkdf2(sha1)";
+ 		list += "pkey";
+@@ -6788,8 +6802,10 @@
+ 			return new opensslHashContext( EVP_sha(), this, type);
+ 		else if ( type == "ripemd160" )
+ 			return new opensslHashContext( EVP_ripemd160(), this, type);
++#ifndef OPENSSL_NO_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" )
+@@ -6816,8 +6832,10 @@
+ #endif
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
++#ifndef OPENSSL_NO_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)" )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100717/39e300ac/attachment.html>