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_1_0-pre3~381
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=cb389fe80462e20daba30835a9e86354451bd14f

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>
---

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 90cfb82d85..74bc9891a8 100644
--- a/include/openssl/dh.h
+++ b/include/openssl/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