From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 25 Jul 2016 13:58:07 +0000 (+0100)
Subject: Move X509_LU_RETRY, X509_LU_FAIL
X-Git-Tag: OpenSSL_1_1_0-pre6~76
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4c4a2f670b84394e4675991d805c97547f1af647;p=oweals%2Fopenssl.git

Move X509_LU_RETRY, X509_LU_FAIL

X509_LU_RETRY and X509_LU_FAIL are not X509_OBJECT types so don't include
them in the enum.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 5cb2a40511..18a8d8f687 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -45,10 +45,12 @@ certificate chain.
 */
 
 typedef enum {
-    X509_LU_RETRY = -1,
-    X509_LU_FAIL, X509_LU_X509, X509_LU_CRL
+    X509_LU_NONE = 0,
+    X509_LU_X509, X509_LU_CRL
 } X509_LOOKUP_TYPE;
 
+#define X509_LU_RETRY   -1
+#define X509_LU_FAIL    0
 
 DEFINE_STACK_OF(X509_LOOKUP)
 DEFINE_STACK_OF(X509_OBJECT)