From: Martin Willi <martin@strongswan.org>
Date: Tue, 15 Sep 2009 07:17:04 +0000 (+0200)
Subject: Exponents of a RSA key in openssl are optional (for PGP)
X-Git-Tag: 4.3.5rc1~162
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=012f62a820f0076315e27308adda01ea54cb9f9d;p=thirdparty%2Fstrongswan.git

Exponents of a RSA key in openssl are optional (for PGP)
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
index d944002e51..eefdfa6f57 100644
--- a/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
@@ -378,8 +378,7 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_load(key_type_t type,
 			return &this->public;
 		}
 	}
-	else if (n.ptr && e.ptr && d.ptr && p.ptr && q.ptr &&
-			 exp1.ptr && exp2.ptr && coeff.ptr)
+	else if (n.ptr && e.ptr && d.ptr && p.ptr && q.ptr && coeff.ptr)
 	{
 		this->rsa = RSA_new();
 		this->rsa->n = BN_bin2bn((const u_char*)n.ptr, n.len, NULL);
@@ -387,8 +386,14 @@ openssl_rsa_private_key_t *openssl_rsa_private_key_load(key_type_t type,
 		this->rsa->d = BN_bin2bn((const u_char*)d.ptr, d.len, NULL);
 		this->rsa->p = BN_bin2bn((const u_char*)p.ptr, p.len, NULL);
 		this->rsa->q = BN_bin2bn((const u_char*)q.ptr, q.len, NULL);
-		this->rsa->dmp1 = BN_bin2bn((const u_char*)exp1.ptr, exp1.len, NULL);
-		this->rsa->dmq1 = BN_bin2bn((const u_char*)exp2.ptr, exp2.len, NULL);
+		if (exp1.ptr)
+		{
+			this->rsa->dmp1 = BN_bin2bn((const u_char*)exp1.ptr, exp1.len, NULL);
+		}
+		if (exp2.ptr)
+		{
+			this->rsa->dmq1 = BN_bin2bn((const u_char*)exp2.ptr, exp2.len, NULL);
+		}
 		this->rsa->iqmp = BN_bin2bn((const u_char*)coeff.ptr, coeff.len, NULL);
 		if (RSA_check_key(this->rsa))
 		{