diff options
Diffstat (limited to 'src/include/openssl/x509.h')
| -rw-r--r-- | src/include/openssl/x509.h | 201 |
1 files changed, 94 insertions, 107 deletions
diff --git a/src/include/openssl/x509.h b/src/include/openssl/x509.h index 2a79887..ef1d7fb 100644 --- a/src/include/openssl/x509.h +++ b/src/include/openssl/x509.h @@ -748,8 +748,6 @@ DECLARE_ASN1_FUNCTIONS(X509_PUBKEY) OPENSSL_EXPORT int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey); OPENSSL_EXPORT EVP_PKEY * X509_PUBKEY_get(X509_PUBKEY *key); -OPENSSL_EXPORT int X509_get_pubkey_parameters(EVP_PKEY *pkey, - STACK_OF(X509) *chain); OPENSSL_EXPORT int i2d_PUBKEY(const EVP_PKEY *a,unsigned char **pp); OPENSSL_EXPORT EVP_PKEY * d2i_PUBKEY(EVP_PKEY **a,const unsigned char **pp, long length); @@ -1221,112 +1219,101 @@ OPENSSL_EXPORT int PKCS7_get_PEM_CRLs(STACK_OF(X509_CRL) *out_crls, } #endif -#define X509_F_x509_name_ex_new 100 -#define X509_F_X509_EXTENSION_create_by_NID 101 -#define X509_F_X509_load_crl_file 102 -#define X509_F_X509_TRUST_set 103 -#define X509_F_X509_EXTENSION_create_by_OBJ 104 -#define X509_F_by_file_ctrl 105 -#define X509_F_X509_load_cert_crl_file 106 -#define X509_F_X509_CRL_add0_revoked 107 -#define X509_F_bitstr_cb 108 -#define X509_F_X509_STORE_CTX_new 109 -#define X509_F_X509_REQ_to_X509 110 -#define X509_F_X509v3_add_ext 111 -#define X509_F_ASN1_sign 112 -#define X509_F_asn1_str2type 113 -#define X509_F_i2d_RSA_PUBKEY 114 -#define X509_F_ASN1_item_sign_ctx 115 -#define X509_F_x509_name_encode 116 -#define X509_F_d2i_X509_PKEY 117 -#define X509_F_ASN1_generate_v3 118 -#define X509_F_dir_ctrl 119 -#define X509_F_X509_print_ex_fp 120 -#define X509_F_X509_ATTRIBUTE_get0_data 121 -#define X509_F_X509_NAME_oneline 122 -#define X509_F_X509_CRL_print_fp 123 -#define X509_F_X509_STORE_CTX_get1_issuer 124 -#define X509_F_add_cert_dir 125 -#define X509_F_PKCS7_get_certificates 126 -#define X509_F_X509_ATTRIBUTE_create_by_NID 127 -#define X509_F_X509_ATTRIBUTE_set1_data 128 +#define X509_F_ASN1_digest 100 +#define X509_F_ASN1_item_sign_ctx 101 +#define X509_F_ASN1_item_verify 102 +#define X509_F_NETSCAPE_SPKI_b64_decode 103 +#define X509_F_NETSCAPE_SPKI_b64_encode 104 +#define X509_F_PKCS7_get_certificates 105 +#define X509_F_X509_ATTRIBUTE_create_by_NID 106 +#define X509_F_X509_ATTRIBUTE_create_by_OBJ 107 +#define X509_F_X509_ATTRIBUTE_create_by_txt 108 +#define X509_F_X509_ATTRIBUTE_get0_data 109 +#define X509_F_X509_ATTRIBUTE_set1_data 110 +#define X509_F_X509_CRL_add0_revoked 111 +#define X509_F_X509_CRL_diff 112 +#define X509_F_X509_CRL_print_fp 113 +#define X509_F_X509_EXTENSION_create_by_NID 114 +#define X509_F_X509_EXTENSION_create_by_OBJ 115 +#define X509_F_X509_INFO_new 116 +#define X509_F_X509_NAME_ENTRY_create_by_NID 117 +#define X509_F_X509_NAME_ENTRY_create_by_txt 118 +#define X509_F_X509_NAME_ENTRY_set_object 119 +#define X509_F_X509_NAME_add_entry 120 +#define X509_F_X509_NAME_oneline 121 +#define X509_F_X509_NAME_print 122 +#define X509_F_X509_PKEY_new 123 +#define X509_F_X509_PUBKEY_get 124 +#define X509_F_X509_PUBKEY_set 125 +#define X509_F_X509_REQ_check_private_key 126 +#define X509_F_X509_REQ_to_X509 127 +#define X509_F_X509_STORE_CTX_get1_issuer 128 #define X509_F_X509_STORE_CTX_init 129 -#define X509_F_NETSCAPE_SPKI_b64_decode 130 -#define X509_F_X509_NAME_print 131 -#define X509_F_x509_name_ex_d2i 132 -#define X509_F_X509_PKEY_new 133 -#define X509_F_X509_STORE_add_cert 134 -#define X509_F_parse_tagging 135 -#define X509_F_check_policy 136 -#define X509_F_ASN1_digest 137 -#define X509_F_X509_load_cert_file 138 -#define X509_F_X509_ATTRIBUTE_create_by_txt 139 -#define X509_F_X509_PUBKEY_set 140 -#define X509_F_X509_PUBKEY_get 141 -#define X509_F_get_cert_by_subject 142 -#define X509_F_X509_NAME_add_entry 143 +#define X509_F_X509_STORE_CTX_new 130 +#define X509_F_X509_STORE_CTX_purpose_inherit 131 +#define X509_F_X509_STORE_add_cert 132 +#define X509_F_X509_STORE_add_crl 133 +#define X509_F_X509_TRUST_add 134 +#define X509_F_X509_TRUST_set 135 +#define X509_F_X509_check_private_key 136 +#define X509_F_X509_get_pubkey_parameters 137 +#define X509_F_X509_load_cert_crl_file 138 +#define X509_F_X509_load_cert_file 139 +#define X509_F_X509_load_crl_file 140 +#define X509_F_X509_print_ex_fp 141 +#define X509_F_X509_to_X509_REQ 142 +#define X509_F_X509_verify_cert 143 #define X509_F_X509at_add1_attr 144 -#define X509_F_X509_check_private_key 145 -#define X509_F_append_exp 146 -#define X509_F_i2d_EC_PUBKEY 147 -#define X509_F_X509_INFO_new 148 -#define X509_F_X509_STORE_CTX_purpose_inherit 149 -#define X509_F_NETSCAPE_SPKI_b64_encode 150 -#define X509_F_X509_to_X509_REQ 151 -#define X509_F_X509_NAME_ENTRY_create_by_txt 152 -#define X509_F_X509_NAME_ENTRY_set_object 153 -#define X509_F_asn1_cb 154 -#define X509_F_X509_verify_cert 155 -#define X509_F_X509_CRL_diff 156 -#define X509_F_i2d_PrivateKey 157 -#define X509_F_X509_REQ_check_private_key 158 -#define X509_F_X509_STORE_add_crl 159 -#define X509_F_X509_get_pubkey_parameters 160 -#define X509_F_ASN1_item_verify 161 -#define X509_F_X509_ATTRIBUTE_create_by_OBJ 162 -#define X509_F_i2d_DSA_PUBKEY 163 -#define X509_F_X509_TRUST_add 164 -#define X509_F_X509_NAME_ENTRY_create_by_NID 165 -#define X509_F_PKCS7_get_CRLs 166 -#define X509_F_pkcs7_parse_header 167 -#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 100 -#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN 101 -#define X509_R_METHOD_NOT_SUPPORTED 102 -#define X509_R_UNSUPPORTED_ALGORITHM 103 -#define X509_R_CRL_VERIFY_FAILURE 104 -#define X509_R_BASE64_DECODE_ERROR 105 -#define X509_R_INVALID_TRUST 106 -#define X509_R_UNKNOWN_NID 107 -#define X509_R_INVALID_DIRECTORY 108 -#define X509_R_KEY_VALUES_MISMATCH 109 -#define X509_R_CERT_ALREADY_IN_HASH_TABLE 110 -#define X509_R_PUBLIC_KEY_DECODE_ERROR 111 -#define X509_R_NOT_PKCS7_SIGNED_DATA 112 -#define X509_R_PUBLIC_KEY_ENCODE_ERROR 113 -#define X509_R_LOADING_CERT_DIR 114 -#define X509_R_WRONG_TYPE 115 -#define X509_R_UNKNOWN_PURPOSE_ID 116 -#define X509_R_NEWER_CRL_NOT_NEWER 117 -#define X509_R_UNKNOWN_TRUST_ID 118 -#define X509_R_KEY_TYPE_MISMATCH 120 -#define X509_R_UNKNOWN_KEY_TYPE 121 -#define X509_R_BAD_X509_FILETYPE 122 -#define X509_R_ISSUER_MISMATCH 123 -#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY 124 -#define X509_R_WRONG_LOOKUP_TYPE 125 -#define X509_R_CONTEXT_NOT_INITIALISED 126 -#define X509_R_CANT_CHECK_DH_KEY 127 -#define X509_R_NO_CERTIFICATES_INCLUDED 128 -#define X509_R_INVALID_FIELD_NAME 129 -#define X509_R_SHOULD_RETRY 130 -#define X509_R_NO_CRL_NUMBER 131 -#define X509_R_IDP_MISMATCH 132 -#define X509_R_LOADING_DEFAULTS 133 -#define X509_R_BAD_PKCS7_VERSION 134 -#define X509_R_CRL_ALREADY_DELTA 135 -#define X509_R_ERR_ASN1_LIB 136 -#define X509_R_AKID_MISMATCH 137 -#define X509_R_INVALID_BIT_STRING_BITS_LEFT 138 -#define X509_R_NO_CRLS_INCLUDED 139 +#define X509_F_X509v3_add_ext 145 +#define X509_F_add_cert_dir 146 +#define X509_F_by_file_ctrl 147 +#define X509_F_check_policy 148 +#define X509_F_dir_ctrl 149 +#define X509_F_get_cert_by_subject 150 +#define X509_F_i2d_DSA_PUBKEY 151 +#define X509_F_i2d_EC_PUBKEY 152 +#define X509_F_i2d_RSA_PUBKEY 153 +#define X509_F_x509_name_encode 154 +#define X509_F_x509_name_ex_d2i 155 +#define X509_F_x509_name_ex_new 156 +#define X509_F_pkcs7_parse_header 157 +#define X509_F_PKCS7_get_CRLs 158 +#define X509_R_AKID_MISMATCH 100 +#define X509_R_BAD_PKCS7_VERSION 101 +#define X509_R_BAD_X509_FILETYPE 102 +#define X509_R_BASE64_DECODE_ERROR 103 +#define X509_R_CANT_CHECK_DH_KEY 104 +#define X509_R_CERT_ALREADY_IN_HASH_TABLE 105 +#define X509_R_CRL_ALREADY_DELTA 106 +#define X509_R_CRL_VERIFY_FAILURE 107 +#define X509_R_IDP_MISMATCH 108 +#define X509_R_INVALID_BIT_STRING_BITS_LEFT 109 +#define X509_R_INVALID_DIRECTORY 110 +#define X509_R_INVALID_FIELD_NAME 111 +#define X509_R_INVALID_TRUST 112 +#define X509_R_ISSUER_MISMATCH 113 +#define X509_R_KEY_TYPE_MISMATCH 114 +#define X509_R_KEY_VALUES_MISMATCH 115 +#define X509_R_LOADING_CERT_DIR 116 +#define X509_R_LOADING_DEFAULTS 117 +#define X509_R_METHOD_NOT_SUPPORTED 118 +#define X509_R_NEWER_CRL_NOT_NEWER 119 +#define X509_R_NOT_PKCS7_SIGNED_DATA 120 +#define X509_R_NO_CERTIFICATES_INCLUDED 121 +#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 122 +#define X509_R_NO_CRL_NUMBER 123 +#define X509_R_PUBLIC_KEY_DECODE_ERROR 124 +#define X509_R_PUBLIC_KEY_ENCODE_ERROR 125 +#define X509_R_SHOULD_RETRY 126 +#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN 127 +#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY 128 +#define X509_R_UNKNOWN_KEY_TYPE 129 +#define X509_R_UNKNOWN_NID 130 +#define X509_R_UNKNOWN_PURPOSE_ID 131 +#define X509_R_UNKNOWN_TRUST_ID 132 +#define X509_R_UNSUPPORTED_ALGORITHM 133 +#define X509_R_WRONG_LOOKUP_TYPE 134 +#define X509_R_WRONG_TYPE 135 +#define X509_R_NO_CRLS_INCLUDED 136 #endif |