OpenSSL upgraded to 1.1.1

1 files changed, 293 insertions, 313 deletions

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index dd72192952..f6d0aa6ae4 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -1,76 +1,24 @@
-/* crypto/x509/x509_vfy.h */

-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

- * All rights reserved.

- *

- * This package is an SSL implementation written

- * by Eric Young (eay@cryptsoft.com).

- * The implementation was written so as to conform with Netscapes SSL.

- *

- * This library is free for commercial and non-commercial use as long as

- * the following conditions are aheared to.  The following conditions

- * apply to all code found in this distribution, be it the RC4, RSA,

- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

- * included with this distribution is covered by the same copyright terms

- * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- *

- * Copyright remains Eric Young's, and as such any Copyright notices in

- * the code are not to be removed.

- * If this package is used in a product, Eric Young should be given attribution

- * as the author of the parts of the library used.

- * This can be in the form of a textual message at program startup or

- * in documentation (online or textual) provided with the package.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- *    must display the following acknowledgement:

- *    "This product includes cryptographic software written by

- *     Eric Young (eay@cryptsoft.com)"

- *    The word 'cryptographic' can be left out if the rouines from the library

- *    being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from

- *    the apps directory (application code) you must include an acknowledgement:

- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- *

- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- *

- * The licence and distribution terms for any publically available version or

- * derivative of this code cannot be changed.  i.e. this code cannot simply be

- * copied and put under another distribution licence

- * [including the GNU Public Licence.]

- */

-

-#ifndef HEADER_X509_H

-# include <openssl/x509.h>

 /*

- * openssl/x509.h ends up #include-ing this file at about the only

- * appropriate moment.

+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.

+ *

+ * Licensed under the OpenSSL license (the "License").  You may not use

+ * this file except in compliance with the License.  You can obtain a copy

+ * in the file LICENSE in the source distribution or at

+ * https://www.openssl.org/source/license.html

  */

-#endif

 

 #ifndef HEADER_X509_VFY_H

 # define HEADER_X509_VFY_H

 

-# include <openssl/opensslconf.h>

-# ifndef OPENSSL_NO_LHASH

-#  include <openssl/lhash.h>

+/*

+ * Protect against recursion, x509.h and x509_vfy.h each include the other.

+ */

+# ifndef HEADER_X509_H

+#  include <openssl/x509.h>

 # endif

+

+# include <openssl/opensslconf.h>

+# include <openssl/lhash.h>

 # include <openssl/bio.h>

 # include <openssl/crypto.h>

 # include <openssl/symhacks.h>

@@ -79,24 +27,6 @@
 extern "C" {

 #endif

 

-# if 0

-/* Outer object */

-typedef struct x509_hash_dir_st {

-    int num_dirs;

-    char **dirs;

-    int *dirs_type;

-    int num_dirs_alloced;

-} X509_HASH_DIR_CTX;

-# endif

-

-typedef struct x509_file_st {

-    int num_paths;              /* number of paths to files or directories */

-    int num_alloced;

-    char **paths;               /* the list of paths or directories */

-    int *path_type;

-} X509_CERT_FILE_CTX;

-

-/*******************************/

 /*-

 SSL_CTX -> X509_STORE

                 -> X509_LOOKUP

@@ -114,187 +44,41 @@ The X509_STORE then calls a function to actually verify the
 certificate chain.

 */

 

-# define X509_LU_RETRY           -1

-# define X509_LU_FAIL            0

-# define X509_LU_X509            1

-# define X509_LU_CRL             2

-# define X509_LU_PKEY            3

-

-typedef struct x509_object_st {

-    /* one of the above types */

-    int type;

-    union {

-        char *ptr;

-        X509 *x509;

-        X509_CRL *crl;

-        EVP_PKEY *pkey;

-    } data;

-} X509_OBJECT;

-

-typedef struct x509_lookup_st X509_LOOKUP;

-

-DECLARE_STACK_OF(X509_LOOKUP)

-DECLARE_STACK_OF(X509_OBJECT)

-

-/* This is a static that defines the function interface */

-typedef struct x509_lookup_method_st {

-    const char *name;

-    int (*new_item) (X509_LOOKUP *ctx);

-    void (*free) (X509_LOOKUP *ctx);

-    int (*init) (X509_LOOKUP *ctx);

-    int (*shutdown) (X509_LOOKUP *ctx);

-    int (*ctrl) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,

-                 char **ret);

-    int (*get_by_subject) (X509_LOOKUP *ctx, int type, X509_NAME *name,

-                           X509_OBJECT *ret);

-    int (*get_by_issuer_serial) (X509_LOOKUP *ctx, int type, X509_NAME *name,

-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);

-    int (*get_by_fingerprint) (X509_LOOKUP *ctx, int type,

-                               unsigned char *bytes, int len,

-                               X509_OBJECT *ret);

-    int (*get_by_alias) (X509_LOOKUP *ctx, int type, char *str, int len,

-                         X509_OBJECT *ret);

-} X509_LOOKUP_METHOD;

-

-typedef struct X509_VERIFY_PARAM_ID_st X509_VERIFY_PARAM_ID;

-

-/*

- * This structure hold all parameters associated with a verify operation by

- * including an X509_VERIFY_PARAM structure in related structures the

- * parameters used can be customized

- */

+typedef enum {

+    X509_LU_NONE = 0,

+    X509_LU_X509, X509_LU_CRL

+} X509_LOOKUP_TYPE;

 

-typedef struct X509_VERIFY_PARAM_st {

-    char *name;

-    time_t check_time;          /* Time to use */

-    unsigned long inh_flags;    /* Inheritance flags */

-    unsigned long flags;        /* Various verify flags */

-    int purpose;                /* purpose to check untrusted certificates */

-    int trust;                  /* trust setting to check */

-    int depth;                  /* Verify depth */

-    STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */

-    X509_VERIFY_PARAM_ID *id;   /* opaque ID data */

-} X509_VERIFY_PARAM;

-

-DECLARE_STACK_OF(X509_VERIFY_PARAM)

+#if OPENSSL_API_COMPAT < 0x10100000L

+#define X509_LU_RETRY   -1

+#define X509_LU_FAIL    0

+#endif

 

-/*

- * This is used to hold everything.  It is used for all certificate

- * validation.  Once we have a certificate chain, the 'verify' function is

- * then called to actually check the cert chain.

- */

-struct x509_store_st {

-    /* The following is a cache of trusted certs */

-    int cache;                  /* if true, stash any hits */

-    STACK_OF(X509_OBJECT) *objs; /* Cache of all objects */

-    /* These are external lookup methods */

-    STACK_OF(X509_LOOKUP) *get_cert_methods;

-    X509_VERIFY_PARAM *param;

-    /* Callbacks for various operations */

-    /* called to verify a certificate */

-    int (*verify) (X509_STORE_CTX *ctx);

-    /* error callback */

-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);

-    /* get issuers cert from ctx */

-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);

-    /* check issued */

-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);

-    /* Check revocation status of chain */

-    int (*check_revocation) (X509_STORE_CTX *ctx);

-    /* retrieve CRL */

-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);

-    /* Check CRL validity */

-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);

-    /* Check certificate against CRL */

-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);

-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);

-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);

-    int (*cleanup) (X509_STORE_CTX *ctx);

-    CRYPTO_EX_DATA ex_data;

-    int references;

-} /* X509_STORE */ ;

+DEFINE_STACK_OF(X509_LOOKUP)

+DEFINE_STACK_OF(X509_OBJECT)

+DEFINE_STACK_OF(X509_VERIFY_PARAM)

 

 int X509_STORE_set_depth(X509_STORE *store, int depth);

 

-# define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))

-# define X509_STORE_set_verify_func(ctx,func)    ((ctx)->verify=(func))

+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);

+typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);

+typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,

+                                            X509_STORE_CTX *ctx, X509 *x);

+typedef int (*X509_STORE_CTX_check_issued_fn)(X509_STORE_CTX *ctx,

+                                              X509 *x, X509 *issuer);

+typedef int (*X509_STORE_CTX_check_revocation_fn)(X509_STORE_CTX *ctx);

+typedef int (*X509_STORE_CTX_get_crl_fn)(X509_STORE_CTX *ctx,

+                                         X509_CRL **crl, X509 *x);

+typedef int (*X509_STORE_CTX_check_crl_fn)(X509_STORE_CTX *ctx, X509_CRL *crl);

+typedef int (*X509_STORE_CTX_cert_crl_fn)(X509_STORE_CTX *ctx,

+                                          X509_CRL *crl, X509 *x);

+typedef int (*X509_STORE_CTX_check_policy_fn)(X509_STORE_CTX *ctx);

+typedef STACK_OF(X509) *(*X509_STORE_CTX_lookup_certs_fn)(X509_STORE_CTX *ctx,

+                                                          X509_NAME *nm);

+typedef STACK_OF(X509_CRL) *(*X509_STORE_CTX_lookup_crls_fn)(X509_STORE_CTX *ctx,

+                                                             X509_NAME *nm);

+typedef int (*X509_STORE_CTX_cleanup_fn)(X509_STORE_CTX *ctx);

 

-/* This is the functions plus an instance of the local variables. */

-struct x509_lookup_st {

-    int init;                   /* have we been started */

-    int skip;                   /* don't use us. */

-    X509_LOOKUP_METHOD *method; /* the functions */

-    char *method_data;          /* method data */

-    X509_STORE *store_ctx;      /* who owns us */

-} /* X509_LOOKUP */ ;

-

-/*

- * This is a used when verifying cert chains.  Since the gathering of the

- * cert chain can take some time (and have to be 'retried', this needs to be

- * kept and passed around.

- */

-struct x509_store_ctx_st {      /* X509_STORE_CTX */

-    X509_STORE *ctx;

-    /* used when looking up certs */

-    int current_method;

-    /* The following are set by the caller */

-    /* The cert to check */

-    X509 *cert;

-    /* chain of X509s - untrusted - passed in */

-    STACK_OF(X509) *untrusted;

-    /* set of CRLs passed in */

-    STACK_OF(X509_CRL) *crls;

-    X509_VERIFY_PARAM *param;

-    /* Other info for use with get_issuer() */

-    void *other_ctx;

-    /* Callbacks for various operations */

-    /* called to verify a certificate */

-    int (*verify) (X509_STORE_CTX *ctx);

-    /* error callback */

-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);

-    /* get issuers cert from ctx */

-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);

-    /* check issued */

-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);

-    /* Check revocation status of chain */

-    int (*check_revocation) (X509_STORE_CTX *ctx);

-    /* retrieve CRL */

-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);

-    /* Check CRL validity */

-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);

-    /* Check certificate against CRL */

-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);

-    int (*check_policy) (X509_STORE_CTX *ctx);

-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);

-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);

-    int (*cleanup) (X509_STORE_CTX *ctx);

-    /* The following is built up */

-    /* if 0, rebuild chain */

-    int valid;

-    /* index of last untrusted cert */

-    int last_untrusted;

-    /* chain of X509s - built up and trusted */

-    STACK_OF(X509) *chain;

-    /* Valid policy tree */

-    X509_POLICY_TREE *tree;

-    /* Require explicit policy value */

-    int explicit_policy;

-    /* When something goes wrong, this is why */

-    int error_depth;

-    int error;

-    X509 *current_cert;

-    /* cert currently being tested as valid issuer */

-    X509 *current_issuer;

-    /* current CRL */

-    X509_CRL *current_crl;

-    /* score of current CRL */

-    int current_crl_score;

-    /* Reason mask */

-    unsigned int current_reasons;

-    /* For CRL path validation: parent context */

-    X509_STORE_CTX *parent;

-    CRYPTO_EX_DATA ex_data;

-} /* X509_STORE_CTX */ ;

 

 void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);

 

@@ -314,7 +98,6 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 

 # define         X509_V_OK                                       0

 # define         X509_V_ERR_UNSPECIFIED                          1

-

 # define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2

 # define         X509_V_ERR_UNABLE_TO_GET_CRL                    3

 # define         X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4

@@ -347,7 +130,6 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 # define         X509_V_ERR_AKID_SKID_MISMATCH                   30

 # define         X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH          31

 # define         X509_V_ERR_KEYUSAGE_NO_CERTSIGN                 32

-

 # define         X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER             33

 # define         X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION         34

 # define         X509_V_ERR_KEYUSAGE_NO_CRL_SIGN                 35

@@ -356,24 +138,23 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 # define         X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED           38

 # define         X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE        39

 # define         X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED       40

-

 # define         X509_V_ERR_INVALID_EXTENSION                    41

 # define         X509_V_ERR_INVALID_POLICY_EXTENSION             42

 # define         X509_V_ERR_NO_EXPLICIT_POLICY                   43

 # define         X509_V_ERR_DIFFERENT_CRL_SCOPE                  44

 # define         X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE        45

-

 # define         X509_V_ERR_UNNESTED_RESOURCE                    46

-

 # define         X509_V_ERR_PERMITTED_VIOLATION                  47

 # define         X509_V_ERR_EXCLUDED_VIOLATION                   48

 # define         X509_V_ERR_SUBTREE_MINMAX                       49

+/* The application is not happy */

 # define         X509_V_ERR_APPLICATION_VERIFICATION             50

 # define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE          51

 # define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX        52

 # define         X509_V_ERR_UNSUPPORTED_NAME_SYNTAX              53

 # define         X509_V_ERR_CRL_PATH_VALIDATION_ERROR            54

-

+/* Another issuer check debug option */

+# define         X509_V_ERR_PATH_LOOP                            55

 /* Suite B mode algorithm violation */

 # define         X509_V_ERR_SUITE_B_INVALID_VERSION              56

 # define         X509_V_ERR_SUITE_B_INVALID_ALGORITHM            57

@@ -381,23 +162,38 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 # define         X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM  59

 # define         X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED              60

 # define         X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 61

-

 /* Host, email and IP check errors */

 # define         X509_V_ERR_HOSTNAME_MISMATCH                    62

 # define         X509_V_ERR_EMAIL_MISMATCH                       63

 # define         X509_V_ERR_IP_ADDRESS_MISMATCH                  64

-

+/* DANE TLSA errors */

+# define         X509_V_ERR_DANE_NO_MATCH                        65

+/* security level errors */

+# define         X509_V_ERR_EE_KEY_TOO_SMALL                     66

+# define         X509_V_ERR_CA_KEY_TOO_SMALL                     67

+# define         X509_V_ERR_CA_MD_TOO_WEAK                       68

 /* Caller error */

-# define         X509_V_ERR_INVALID_CALL                         65

+# define         X509_V_ERR_INVALID_CALL                         69

 /* Issuer lookup error */

-# define         X509_V_ERR_STORE_LOOKUP                         66

-

-# define         X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION         67

+# define         X509_V_ERR_STORE_LOOKUP                         70

+/* Certificate transparency */

+# define         X509_V_ERR_NO_VALID_SCTS                        71

+

+# define         X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION         72

+/* OCSP status errors */

+# define         X509_V_ERR_OCSP_VERIFY_NEEDED                   73  /* Need OCSP verification */

+# define         X509_V_ERR_OCSP_VERIFY_FAILED                   74  /* Couldn't verify cert through OCSP */

+# define         X509_V_ERR_OCSP_CERT_UNKNOWN                    75  /* Certificate wasn't recognized by the OCSP responder */

+# define         X509_V_ERR_SIGNATURE_ALGORITHM_MISMATCH         76

+# define         X509_V_ERR_NO_ISSUER_PUBLIC_KEY                 77

+# define         X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM      78

+# define         X509_V_ERR_EC_KEY_EXPLICIT_PARAMS               79

 

 /* Certificate verify flags */

 

-/* Send issuer+subject checks to verify_cb */

-# define X509_V_FLAG_CB_ISSUER_CHECK             0x1

+# if OPENSSL_API_COMPAT < 0x10100000L

+#  define X509_V_FLAG_CB_ISSUER_CHECK             0x0   /* Deprecated */

+# endif

 /* Use check time instead of current time */

 # define X509_V_FLAG_USE_CHECK_TIME              0x2

 /* Lookup CRLs */

@@ -424,7 +220,7 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 # define X509_V_FLAG_EXTENDED_CRL_SUPPORT        0x1000

 /* Delta CRL support */

 # define X509_V_FLAG_USE_DELTAS                  0x2000

-/* Check selfsigned CA signature */

+/* Check self-signed CA signature */

 # define X509_V_FLAG_CHECK_SS_SIGNATURE          0x4000

 /* Use trusted store first */

 # define X509_V_FLAG_TRUSTED_FIRST               0x8000

@@ -434,15 +230,16 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 # define X509_V_FLAG_SUITEB_192_LOS              0x20000

 /* Suite B 128 bit mode allowing 192 bit algorithms */

 # define X509_V_FLAG_SUITEB_128_LOS              0x30000

-

 /* Allow partial chains if at least one certificate is in trusted store */

 # define X509_V_FLAG_PARTIAL_CHAIN               0x80000

 /*

  * If the initial chain is not trusted, do not attempt to build an alternative

- * chain. Alternate chain checking was introduced in 1.0.2b. Setting this flag

+ * chain. Alternate chain checking was introduced in 1.1.0. Setting this flag

  * will force the behaviour to match that of previous versions.

  */

 # define X509_V_FLAG_NO_ALT_CHAINS               0x100000

+/* Do not check certificate/CRL validity against current time */

+# define X509_V_FLAG_NO_CHECK_TIME               0x200000

 

 # define X509_VP_FLAG_DEFAULT                    0x1

 # define X509_VP_FLAG_OVERWRITE                  0x2

@@ -456,31 +253,84 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
                                 | X509_V_FLAG_INHIBIT_ANY \

                                 | X509_V_FLAG_INHIBIT_MAP)

 

-int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, int type,

+int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,

                                X509_NAME *name);

 X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,

-                                             int type, X509_NAME *name);

+                                             X509_LOOKUP_TYPE type,

+                                             X509_NAME *name);

 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,

                                         X509_OBJECT *x);

-void X509_OBJECT_up_ref_count(X509_OBJECT *a);

-void X509_OBJECT_free_contents(X509_OBJECT *a);

+int X509_OBJECT_up_ref_count(X509_OBJECT *a);

+X509_OBJECT *X509_OBJECT_new(void);

+void X509_OBJECT_free(X509_OBJECT *a);

+X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a);

+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a);

+int X509_OBJECT_set1_X509(X509_OBJECT *a, X509 *obj);

+X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *a);

+int X509_OBJECT_set1_X509_CRL(X509_OBJECT *a, X509_CRL *obj);

 X509_STORE *X509_STORE_new(void);

 void X509_STORE_free(X509_STORE *v);

+int X509_STORE_lock(X509_STORE *ctx);

+int X509_STORE_unlock(X509_STORE *ctx);

+int X509_STORE_up_ref(X509_STORE *v);

+STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v);

 

-STACK_OF(X509) *X509_STORE_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);

-STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);

+STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);

+STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);

 int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);

 int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);

 int X509_STORE_set_trust(X509_STORE *ctx, int trust);

 int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);

-

+X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx);

+

+void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify);

+#define X509_STORE_set_verify_func(ctx, func) \

+            X509_STORE_set_verify((ctx),(func))

+void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,

+                               X509_STORE_CTX_verify_fn verify);

+X509_STORE_CTX_verify_fn X509_STORE_get_verify(X509_STORE *ctx);

 void X509_STORE_set_verify_cb(X509_STORE *ctx,

-                              int (*verify_cb) (int, X509_STORE_CTX *));

-

-void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx,

-                                   STACK_OF(X509_CRL) *(*cb) (X509_STORE_CTX

-                                                              *ctx,

-                                                              X509_NAME *nm));

+                              X509_STORE_CTX_verify_cb verify_cb);

+# define X509_STORE_set_verify_cb_func(ctx,func) \

+            X509_STORE_set_verify_cb((ctx),(func))

+X509_STORE_CTX_verify_cb X509_STORE_get_verify_cb(X509_STORE *ctx);

+void X509_STORE_set_get_issuer(X509_STORE *ctx,

+                               X509_STORE_CTX_get_issuer_fn get_issuer);

+X509_STORE_CTX_get_issuer_fn X509_STORE_get_get_issuer(X509_STORE *ctx);

+void X509_STORE_set_check_issued(X509_STORE *ctx,

+                                 X509_STORE_CTX_check_issued_fn check_issued);

+X509_STORE_CTX_check_issued_fn X509_STORE_get_check_issued(X509_STORE *ctx);

+void X509_STORE_set_check_revocation(X509_STORE *ctx,

+                                     X509_STORE_CTX_check_revocation_fn check_revocation);

+X509_STORE_CTX_check_revocation_fn X509_STORE_get_check_revocation(X509_STORE *ctx);

+void X509_STORE_set_get_crl(X509_STORE *ctx,

+                            X509_STORE_CTX_get_crl_fn get_crl);

+X509_STORE_CTX_get_crl_fn X509_STORE_get_get_crl(X509_STORE *ctx);

+void X509_STORE_set_check_crl(X509_STORE *ctx,

+                              X509_STORE_CTX_check_crl_fn check_crl);

+X509_STORE_CTX_check_crl_fn X509_STORE_get_check_crl(X509_STORE *ctx);

+void X509_STORE_set_cert_crl(X509_STORE *ctx,

+                             X509_STORE_CTX_cert_crl_fn cert_crl);

+X509_STORE_CTX_cert_crl_fn X509_STORE_get_cert_crl(X509_STORE *ctx);

+void X509_STORE_set_check_policy(X509_STORE *ctx,

+                                 X509_STORE_CTX_check_policy_fn check_policy);

+X509_STORE_CTX_check_policy_fn X509_STORE_get_check_policy(X509_STORE *ctx);

+void X509_STORE_set_lookup_certs(X509_STORE *ctx,

+                                 X509_STORE_CTX_lookup_certs_fn lookup_certs);

+X509_STORE_CTX_lookup_certs_fn X509_STORE_get_lookup_certs(X509_STORE *ctx);

+void X509_STORE_set_lookup_crls(X509_STORE *ctx,

+                                X509_STORE_CTX_lookup_crls_fn lookup_crls);

+#define X509_STORE_set_lookup_crls_cb(ctx, func) \

+    X509_STORE_set_lookup_crls((ctx), (func))

+X509_STORE_CTX_lookup_crls_fn X509_STORE_get_lookup_crls(X509_STORE *ctx);

+void X509_STORE_set_cleanup(X509_STORE *ctx,

+                            X509_STORE_CTX_cleanup_fn cleanup);

+X509_STORE_CTX_cleanup_fn X509_STORE_get_cleanup(X509_STORE *ctx);

+

+#define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \

+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, l, p, newf, dupf, freef)

+int X509_STORE_set_ex_data(X509_STORE *ctx, int idx, void *data);

+void *X509_STORE_get_ex_data(X509_STORE *ctx, int idx);

 

 X509_STORE_CTX *X509_STORE_CTX_new(void);

 

@@ -489,68 +339,170 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
 void X509_STORE_CTX_free(X509_STORE_CTX *ctx);

 int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,

                         X509 *x509, STACK_OF(X509) *chain);

-void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);

+void X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);

 void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);

 

 X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx);

+X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx);

+STACK_OF(X509)* X509_STORE_CTX_get0_untrusted(X509_STORE_CTX *ctx);

+void X509_STORE_CTX_set0_untrusted(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);

+void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,

+                                  X509_STORE_CTX_verify_cb verify);

+X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(X509_STORE_CTX *ctx);

+X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);

+X509_STORE_CTX_get_issuer_fn X509_STORE_CTX_get_get_issuer(X509_STORE_CTX *ctx);

+X509_STORE_CTX_check_issued_fn X509_STORE_CTX_get_check_issued(X509_STORE_CTX *ctx);

+X509_STORE_CTX_check_revocation_fn X509_STORE_CTX_get_check_revocation(X509_STORE_CTX *ctx);

+X509_STORE_CTX_get_crl_fn X509_STORE_CTX_get_get_crl(X509_STORE_CTX *ctx);

+X509_STORE_CTX_check_crl_fn X509_STORE_CTX_get_check_crl(X509_STORE_CTX *ctx);

+X509_STORE_CTX_cert_crl_fn X509_STORE_CTX_get_cert_crl(X509_STORE_CTX *ctx);

+X509_STORE_CTX_check_policy_fn X509_STORE_CTX_get_check_policy(X509_STORE_CTX *ctx);

+X509_STORE_CTX_lookup_certs_fn X509_STORE_CTX_get_lookup_certs(X509_STORE_CTX *ctx);

+X509_STORE_CTX_lookup_crls_fn X509_STORE_CTX_get_lookup_crls(X509_STORE_CTX *ctx);

+X509_STORE_CTX_cleanup_fn X509_STORE_CTX_get_cleanup(X509_STORE_CTX *ctx);

+

+#if OPENSSL_API_COMPAT < 0x10100000L

+# define X509_STORE_CTX_get_chain X509_STORE_CTX_get0_chain

+# define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted

+# define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack

+# define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject

+# define X509_STORE_get1_certs X509_STORE_CTX_get1_certs

+# define X509_STORE_get1_crls X509_STORE_CTX_get1_crls

+/* the following macro is misspelled; use X509_STORE_get1_certs instead */

+# define X509_STORE_get1_cert X509_STORE_CTX_get1_certs

+/* the following macro is misspelled; use X509_STORE_get1_crls instead */

+# define X509_STORE_get1_crl X509_STORE_CTX_get1_crls

+#endif

 

 X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);

-

 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);

 X509_LOOKUP_METHOD *X509_LOOKUP_file(void);

 

+typedef int (*X509_LOOKUP_ctrl_fn)(X509_LOOKUP *ctx, int cmd, const char *argc,

+                                   long argl, char **ret);

+typedef int (*X509_LOOKUP_get_by_subject_fn)(X509_LOOKUP *ctx,

+                                             X509_LOOKUP_TYPE type,

+                                             X509_NAME *name,

+                                             X509_OBJECT *ret);

+typedef int (*X509_LOOKUP_get_by_issuer_serial_fn)(X509_LOOKUP *ctx,

+                                                   X509_LOOKUP_TYPE type,

+                                                   X509_NAME *name,

+                                                   ASN1_INTEGER *serial,

+                                                   X509_OBJECT *ret);

+typedef int (*X509_LOOKUP_get_by_fingerprint_fn)(X509_LOOKUP *ctx,

+                                                 X509_LOOKUP_TYPE type,

+                                                 const unsigned char* bytes,

+                                                 int len,

+                                                 X509_OBJECT *ret);

+typedef int (*X509_LOOKUP_get_by_alias_fn)(X509_LOOKUP *ctx,

+                                           X509_LOOKUP_TYPE type,

+                                           const char *str,

+                                           int len,

+                                           X509_OBJECT *ret);

+

+X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name);

+void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method);

+

+int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method,

+                                  int (*new_item) (X509_LOOKUP *ctx));

+int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))

+    (X509_LOOKUP *ctx);

+

+int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method,

+                              void (*free_fn) (X509_LOOKUP *ctx));

+void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))

+    (X509_LOOKUP *ctx);

+

+int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method,

+                              int (*init) (X509_LOOKUP *ctx));

+int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method))

+    (X509_LOOKUP *ctx);

+

+int X509_LOOKUP_meth_set_shutdown(X509_LOOKUP_METHOD *method,

+                                  int (*shutdown) (X509_LOOKUP *ctx));

+int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method))

+    (X509_LOOKUP *ctx);

+

+int X509_LOOKUP_meth_set_ctrl(X509_LOOKUP_METHOD *method,

+                              X509_LOOKUP_ctrl_fn ctrl_fn);

+X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method);

+

+int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method,

+                                        X509_LOOKUP_get_by_subject_fn fn);

+X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject(

+    const X509_LOOKUP_METHOD *method);

+

+int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method,

+    X509_LOOKUP_get_by_issuer_serial_fn fn);

+X509_LOOKUP_get_by_issuer_serial_fn X509_LOOKUP_meth_get_get_by_issuer_serial(

+    const X509_LOOKUP_METHOD *method);

+

+int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method,

+    X509_LOOKUP_get_by_fingerprint_fn fn);

+X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint(

+    const X509_LOOKUP_METHOD *method);

+

+int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method,

+                                      X509_LOOKUP_get_by_alias_fn fn);

+X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias(

+    const X509_LOOKUP_METHOD *method);

+

+

 int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);

 int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);

 

-int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,

-                              X509_OBJECT *ret);

+int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,

+                                  X509_NAME *name, X509_OBJECT *ret);

+X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs,

+                                               X509_LOOKUP_TYPE type,

+                                               X509_NAME *name);

 

 int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,

                      long argl, char **ret);

 

-# ifndef OPENSSL_NO_STDIO

 int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);

 int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);

 int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);

-# endif

 

 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);

 void X509_LOOKUP_free(X509_LOOKUP *ctx);

 int X509_LOOKUP_init(X509_LOOKUP *ctx);

-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,

-                           X509_OBJECT *ret);

-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,

-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);

-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,

-                               unsigned char *bytes, int len,

+int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,

+                           X509_NAME *name, X509_OBJECT *ret);

+int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,

+                                 X509_NAME *name, ASN1_INTEGER *serial,

+                                 X509_OBJECT *ret);

+int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,

+                               const unsigned char *bytes, int len,

                                X509_OBJECT *ret);

-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,

-                         X509_OBJECT *ret);

+int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,

+                         const char *str, int len, X509_OBJECT *ret);

+int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data);

+void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx);

+X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx);

 int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);

 

-# ifndef OPENSSL_NO_STDIO

 int X509_STORE_load_locations(X509_STORE *ctx,

                               const char *file, const char *dir);

 int X509_STORE_set_default_paths(X509_STORE *ctx);

-# endif

 

-int X509_STORE_CTX_get_ex_new_index(long argl, void *argp,

-                                    CRYPTO_EX_new *new_func,

-                                    CRYPTO_EX_dup *dup_func,

-                                    CRYPTO_EX_free *free_func);

+#define X509_STORE_CTX_get_ex_new_index(l, p, newf, dupf, freef) \

+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE_CTX, l, p, newf, dupf, freef)

 int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data);

 void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx);

 int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);

 void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s);

 int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);

+void X509_STORE_CTX_set_error_depth(X509_STORE_CTX *ctx, int depth);

 X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);

+void X509_STORE_CTX_set_current_cert(X509_STORE_CTX *ctx, X509 *x);

 X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);

 X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);

 X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);

-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);

+STACK_OF(X509) *X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);

 STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);

 void X509_STORE_CTX_set_cert(X509_STORE_CTX *c, X509 *x);

-void X509_STORE_CTX_set_chain(X509_STORE_CTX *c, STACK_OF(X509) *sk);

+void X509_STORE_CTX_set0_verified_chain(X509_STORE_CTX *c, STACK_OF(X509) *sk);

 void X509_STORE_CTX_set0_crls(X509_STORE_CTX *c, STACK_OF(X509_CRL) *sk);

 int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);

 int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);

@@ -559,16 +511,22 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
 void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);

 void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,

                              time_t t);

-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,

-                                  int (*verify_cb) (int, X509_STORE_CTX *));

 

 X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);

 int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);

+int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx);

 

 X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx);

 void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param);

 int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name);

 

+/*

+ * Bridge opacity barrier between libcrypt and libssl, also needed to support

+ * offline testing in test/danetest.c

+ */

+void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane);

+#define DANE_FLAG_NO_DANE_EE_NAMECHECKS (1L << 0)

+

 /* X509_VERIFY_PARAM functions */

 

 X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);

@@ -586,19 +544,27 @@ unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);

 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);

 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);

+void X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level);

+time_t X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param);

 void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);

 int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,

                                   ASN1_OBJECT *policy);

 int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,

                                     STACK_OF(ASN1_OBJECT) *policies);

 

+int X509_VERIFY_PARAM_set_inh_flags(X509_VERIFY_PARAM *param,

+                                    uint32_t flags);

+uint32_t X509_VERIFY_PARAM_get_inh_flags(const X509_VERIFY_PARAM *param);

+

 int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,

                                 const char *name, size_t namelen);

 int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,

                                 const char *name, size_t namelen);

 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,

                                      unsigned int flags);

+unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param);

 char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);

+void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);

 int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,

                                  const char *email, size_t emaillen);

 int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,

@@ -607,6 +573,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param,
                                   const char *ipasc);

 

 int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);

+int X509_VERIFY_PARAM_get_auth_level(const X509_VERIFY_PARAM *param);

 const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param);

 

 int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param);

@@ -615,6 +582,19 @@ const X509_VERIFY_PARAM *X509_VERIFY_PARAM_get0(int id);
 const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);

 void X509_VERIFY_PARAM_table_cleanup(void);

 

+/* Non positive return values are errors */

+#define X509_PCY_TREE_FAILURE  -2 /* Failure to satisfy explicit policy */

+#define X509_PCY_TREE_INVALID  -1 /* Inconsistent or invalid extensions */

+#define X509_PCY_TREE_INTERNAL  0 /* Internal error, most likely malloc */

+

+/*

+ * Positive return values form a bit mask, all but the first are internal to

+ * the library and don't appear in results from X509_policy_check().

+ */

+#define X509_PCY_TREE_VALID     1 /* The policy tree is valid */

+#define X509_PCY_TREE_EMPTY     2 /* The policy tree is empty */

+#define X509_PCY_TREE_EXPLICIT  4 /* Explicit policy required */

+

 int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,

                       STACK_OF(X509) *certs,

                       STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);