128 lines
3.8 KiB
Plaintext
128 lines
3.8 KiB
Plaintext
$OpenBSD: patch-qca-ossl_cpp,v 1.2 2012/06/28 18:57:29 jasper Exp $
|
|
|
|
Allow building against OpenSSL without MD2 or SSLv2 support.
|
|
|
|
--- qca-ossl.cpp.orig Tue Dec 11 01:34:57 2007
|
|
+++ qca-ossl.cpp Thu Jun 28 01:12:24 2012
|
|
@@ -1771,8 +1771,10 @@ class RSAKey : public RSAContext (public)
|
|
md = EVP_sha1();
|
|
else if(alg == EMSA3_MD5)
|
|
md = EVP_md5();
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
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 @@ class RSAKey : public RSAContext (public)
|
|
md = EVP_sha1();
|
|
else if(alg == EMSA3_MD5)
|
|
md = EVP_md5();
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
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 @@ class MyCertContext : public CertContext (public)
|
|
case NID_md5WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD5;
|
|
break;
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
case NID_md2WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD2;
|
|
break;
|
|
+#endif
|
|
case NID_ripemd160WithRSA:
|
|
p.sigalgo = QCA::EMSA3_RIPEMD160;
|
|
break;
|
|
@@ -3871,9 +3877,11 @@ class MyCSRContext : public CSRContext (public)
|
|
case NID_md5WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD5;
|
|
break;
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
case NID_md2WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD2;
|
|
break;
|
|
+#endif
|
|
case NID_ripemd160WithRSA:
|
|
p.sigalgo = QCA::EMSA3_RIPEMD160;
|
|
break;
|
|
@@ -4061,9 +4069,11 @@ class MyCRLContext : public CRLContext (public)
|
|
case NID_md5WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD5;
|
|
break;
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
case NID_md2WithRSAEncryption:
|
|
p.sigalgo = QCA::EMSA3_MD2;
|
|
break;
|
|
+#endif
|
|
case NID_ripemd160WithRSA:
|
|
p.sigalgo = QCA::EMSA3_RIPEMD160;
|
|
break;
|
|
@@ -5133,9 +5143,11 @@ class MyTLSContext : public TLSContext (public)
|
|
OpenSSL_add_ssl_algorithms();
|
|
SSL_CTX *ctx = 0;
|
|
switch (version) {
|
|
+#ifndef OPENSSL_NO_SSL2
|
|
case TLS::SSL_v2:
|
|
ctx = SSL_CTX_new(SSLv2_client_method());
|
|
break;
|
|
+#endif
|
|
case TLS::SSL_v3:
|
|
ctx = SSL_CTX_new(SSLv3_client_method());
|
|
break;
|
|
@@ -6582,7 +6594,9 @@ static QStringList all_hash_types()
|
|
list += "sha1";
|
|
list += "sha0";
|
|
list += "ripemd160";
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
list += "md2";
|
|
+#endif
|
|
list += "md4";
|
|
list += "md5";
|
|
#ifdef SHA224_DIGEST_LENGTH
|
|
@@ -6757,7 +6771,9 @@ class opensslProvider : public Provider (public)
|
|
list += all_hash_types();
|
|
list += all_mac_types();
|
|
list += all_cipher_types();
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
list += "pbkdf1(md2)";
|
|
+#endif
|
|
list += "pbkdf1(sha1)";
|
|
list += "pbkdf2(sha1)";
|
|
list += "pkey";
|
|
@@ -6788,8 +6804,10 @@ class opensslProvider : public Provider (public)
|
|
return new opensslHashContext( EVP_sha(), this, type);
|
|
else if ( type == "ripemd160" )
|
|
return new opensslHashContext( EVP_ripemd160(), this, type);
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
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 +6834,10 @@ class opensslProvider : public Provider (public)
|
|
#endif
|
|
else if ( type == "pbkdf1(sha1)" )
|
|
return new opensslPbkdf1Context( EVP_sha1(), this, type );
|
|
+#ifdef MD2_DIGEST_LENGTH
|
|
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)" )
|
|
@@ -6934,7 +6954,7 @@ class opensslProvider : public Provider (public)
|
|
return new CMSContext( this );
|
|
else if ( type == "ca" )
|
|
return new MyCAContext( this );
|
|
- return 0;
|
|
+ return NULL;
|
|
}
|
|
};
|
|
|