Move X509_LU_RETRY, X509_LU_FAIL
authorDr. Stephen Henson <steve@openssl.org>
Mon, 25 Jul 2016 13:58:07 +0000 (14:58 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 26 Jul 2016 15:23:02 +0000 (16:23 +0100)
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>
include/openssl/x509_vfy.h

index 5cb2a40511958db6fd6bc47dacc4d2a9b5522527..18a8d8f6874720e2fe5bf4661b5999c3afd4b69a 100644 (file)
@@ -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)