Commit d9b8b89b authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

X509_verify_cert() cleanup 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 63c6aa6b

crypto/x509/x509_err.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 


static ERR_STRING_DATA X509_str_functs[] = {

    {ERR_FUNC(X509_F_ADD_CERT_DIR), "add_cert_dir"},

    {ERR_FUNC(X509_F_BUILD_CHAIN), "build_chain"},

    {ERR_FUNC(X509_F_BY_FILE_CTRL), "by_file_ctrl"},

    {ERR_FUNC(X509_F_CHECK_POLICY), "check_policy"},

    {ERR_FUNC(X509_F_DIR_CTRL), "dir_ctrl"},

crypto/x509/x509_vfy.c

+396 −343

File changed.

Preview size limit exceeded, changes collapsed.

include/openssl/x509.h

+1 −0
Original line number Diff line number Diff line
@@ -1070,6 +1070,7 @@ void ERR_load_X509_strings(void); 


/* Function codes. */

# define X509_F_ADD_CERT_DIR                              100

# define X509_F_BUILD_CHAIN                               106

# define X509_F_BY_FILE_CTRL                              101

# define X509_F_CHECK_POLICY                              145

# define X509_F_DIR_CTRL                                  102

include/openssl/x509_vfy.h

+2 −2
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ struct x509_store_ctx_st { /* X509_STORE_CTX */ 
    /* The following is built up */

    /* if 0, rebuild chain */

    int valid;

    /* index of last untrusted cert */

    int last_untrusted;

    /* number of untrusted certs */

    int num_untrusted;

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

    STACK_OF(X509) *chain;

    /* Valid policy tree */