From: Matt Caswell <matt@openssl.org>
Date: Fri, 29 Jan 2016 09:38:06 +0000 (+0000)
Subject: Correct value of DH_CHECK_PUBKEY_INVALID
X-Git-Tag: OpenSSL_1_0_2g~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7107798ae6c5e19f581915928a69073d17cc21ab;p=oweals%2Fopenssl.git

Correct value of DH_CHECK_PUBKEY_INVALID

A new return value for DH_check_pub_key was recently added:
DH_CHECK_PUBKEY_INVALID. As this is a flag which can be ORed with other
return values it should have been set to the value 4 not 3.

RT#4278

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit cb389fe80462e20daba30835a9e86354451bd14f)
---

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 5498a9dc10..a5bd9016aa 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -174,7 +174,7 @@ struct dh_st {
 /* DH_check_pub_key error codes */
 # define DH_CHECK_PUBKEY_TOO_SMALL       0x01
 # define DH_CHECK_PUBKEY_TOO_LARGE       0x02
-# define DH_CHECK_PUBKEY_INVALID         0x03
+# define DH_CHECK_PUBKEY_INVALID         0x04
 
 /*
  * primes p where (p-1)/2 is prime too are called "safe"; we define this for