--- qca-ossl-2.0.0-beta3/qca-ossl.cpp.with_md2	2007-12-11 07:34:57.000000000 +0100
+++ qca-ossl-2.0.0-beta3/qca-ossl.cpp	2013-11-15 16:53:02.644574388 +0100
@@ -1771,8 +1771,6 @@
 			md = EVP_sha1();
 		else if(alg == EMSA3_MD5)
 			md = EVP_md5();
-		else if(alg == EMSA3_MD2)
-			md = EVP_md2();
 		else if(alg == EMSA3_RIPEMD160)
 			md = EVP_ripemd160();
 		else if(alg == EMSA3_Raw)
@@ -1789,8 +1787,6 @@
 			md = EVP_sha1();
 		else if(alg == EMSA3_MD5)
 			md = EVP_md5();
-		else if(alg == EMSA3_MD2)
-			md = EVP_md2();
 		else if(alg == EMSA3_RIPEMD160)
 			md = EVP_ripemd160();
 		else if(alg == EMSA3_Raw)
@@ -3385,9 +3381,6 @@
 		case NID_md5WithRSAEncryption:
 		    p.sigalgo = QCA::EMSA3_MD5;
 		    break;
-		case NID_md2WithRSAEncryption:
-		    p.sigalgo = QCA::EMSA3_MD2;
-		    break;
 		case NID_ripemd160WithRSA:
 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
 		    break;
@@ -3871,9 +3864,6 @@
 		case NID_md5WithRSAEncryption:
 		    p.sigalgo = QCA::EMSA3_MD5;
 		    break;
-		case NID_md2WithRSAEncryption:
-		    p.sigalgo = QCA::EMSA3_MD2;
-		    break;
 		case NID_ripemd160WithRSA:
 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
 		    break;
@@ -4061,9 +4051,6 @@
 		case NID_md5WithRSAEncryption:
 		    p.sigalgo = QCA::EMSA3_MD5;
 		    break;
-		case NID_md2WithRSAEncryption:
-		    p.sigalgo = QCA::EMSA3_MD2;
-		    break;
 		case NID_ripemd160WithRSA:
 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
 		    break;
@@ -6582,7 +6569,6 @@
 	list += "sha1";
 	list += "sha0";
 	list += "ripemd160";
-	list += "md2";
 	list += "md4";
 	list += "md5";
 #ifdef SHA224_DIGEST_LENGTH
@@ -6757,7 +6743,6 @@
 		list += all_hash_types();
 		list += all_mac_types();
 		list += all_cipher_types();
-		list += "pbkdf1(md2)";
 		list += "pbkdf1(sha1)";
 		list += "pbkdf2(sha1)";
 		list += "pkey";
@@ -6788,8 +6773,6 @@
 			return new opensslHashContext( EVP_sha(), this, type);
 		else if ( type == "ripemd160" )
 			return new opensslHashContext( EVP_ripemd160(), this, type);
-		else if ( type == "md2" )
-			return new opensslHashContext( EVP_md2(), this, type);
 		else if ( type == "md4" )
 			return new opensslHashContext( EVP_md4(), this, type);
 		else if ( type == "md5" )
@@ -6816,8 +6799,6 @@
 #endif
 		else if ( type == "pbkdf1(sha1)" )
 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
-		else if ( type == "pbkdf1(md2)" )
-			return new opensslPbkdf1Context( EVP_md2(), this, type );
 		else if ( type == "pbkdf2(sha1)" )
 			return new opensslPbkdf2Context( this, type );
 		else if ( type == "hmac(md5)" )