From: Matt Caswell <matt@openssl.org>
Date: Fri, 22 May 2015 12:48:49 +0000 (+0100)
Subject: Fix typo setting up certificate masks
X-Git-Tag: OpenSSL_1_0_2b~60
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e4731f76e2dc2a36e62522a4ec115880ba7dfc1f;p=oweals%2Fopenssl.git

Fix typo setting up certificate masks

The certificate masks are used to select which ciphersuite we are going to
use. The variables |emask_k| and |emask_a| relate to export grade key
exchange and authentication respecitively. The variables |mask_k| and
|mask_a| are the equivalent versions for non-export grade. This fixes an
instance where the two usages of export/non-export were mixed up. In
practice it makes little difference since it still works!

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit fdfe8b06ae97da3bc3a77aa3db00f8e0445f3c70)
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b60fe1a898..c0931e7877 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2330,7 +2330,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
     if (dh_dsa_export)
         emask_k |= SSL_kDHd;
 
-    if (emask_k & (SSL_kDHr | SSL_kDHd))
+    if (mask_k & (SSL_kDHr | SSL_kDHd))
         mask_a |= SSL_aDH;
 
     if (rsa_enc || rsa_sign) {