Support verify_depth from the SSL API without need for user-defined
[oweals/openssl.git] / crypto / x509 / x509.h
index 6d2733cccd733d10e0a07471652eac7d55bdef66..7c3ab2fedb07f398f797c452c8e918547354b5f4 100644 (file)
@@ -1,4 +1,3 @@
-
 /* crypto/x509/x509.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
 extern "C" {
 #endif
 
-#include "stack.h"
-#include "asn1.h"
-#include "safestack.h"
+#include <openssl/stack.h>
+#include <openssl/asn1.h>
+#include <openssl/safestack.h>
 
 #ifndef NO_RSA
-#include "rsa.h"
-#else
-#define RSA    long
+#include <openssl/rsa.h>
 #endif
 
 #ifndef NO_DSA
-#include "dsa.h"
-#else
-#define DSA    long
+#include <openssl/dsa.h>
 #endif
 
 #ifndef NO_DH
-#include "dh.h"
-#else
-#define DH     long
+#include <openssl/dh.h>
 #endif
 
-#include "evp.h"
+#include <openssl/evp.h>
 
 #define X509_FILETYPE_PEM      1
 #define X509_FILETYPE_ASN1     2
@@ -362,8 +355,8 @@ typedef struct pkcs8_priv_key_info_st
         STACK *attributes;
         } PKCS8_PRIV_KEY_INFO;
 
-#include "x509_vfy.h"
-#include "pkcs7.h"
+#include <openssl/x509_vfy.h>
+#include <openssl/pkcs7.h>
 
 #ifdef SSLEAY_MACROS
 #define X509_verify(a,r) ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,\
@@ -523,7 +516,6 @@ typedef struct pkcs8_priv_key_info_st
  * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf) */
 #define        X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
 
-#ifndef NOPROTO
 
 #ifndef SSLEAY_MACROS
 #ifdef HEADER_ENVELOPE_H
@@ -551,13 +543,17 @@ X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL *crl);
 int i2d_X509_CRL_fp(FILE *fp,X509_CRL *crl);
 X509_REQ *d2i_X509_REQ_fp(FILE *fp,X509_REQ *req);
 int i2d_X509_REQ_fp(FILE *fp,X509_REQ *req);
+#ifndef NO_RSA
 RSA *d2i_RSAPrivateKey_fp(FILE *fp,RSA *rsa);
 int i2d_RSAPrivateKey_fp(FILE *fp,RSA *rsa);
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
 RSA *d2i_RSAPublicKey_fp(FILE *fp,RSA *rsa);
 int i2d_RSAPublicKey_fp(FILE *fp,RSA *rsa);
 #endif
+#ifndef NO_DSA
+DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
+int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
+#endif
+#endif
 
 #ifdef HEADER_BIO_H
 X509 *d2i_X509_bio(BIO *bp,X509 *x509);
@@ -566,13 +562,17 @@ X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL *crl);
 int i2d_X509_CRL_bio(BIO *bp,X509_CRL *crl);
 X509_REQ *d2i_X509_REQ_bio(BIO *bp,X509_REQ *req);
 int i2d_X509_REQ_bio(BIO *bp,X509_REQ *req);
+#ifndef NO_RSA
 RSA *d2i_RSAPrivateKey_bio(BIO *bp,RSA *rsa);
 int i2d_RSAPrivateKey_bio(BIO *bp,RSA *rsa);
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
 RSA *d2i_RSAPublicKey_bio(BIO *bp,RSA *rsa);
 int i2d_RSAPublicKey_bio(BIO *bp,RSA *rsa);
 #endif
+#ifndef NO_DSA
+DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
+int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
+#endif
+#endif
 
 X509 *X509_dup(X509 *x509);
 X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
@@ -582,8 +582,10 @@ X509_REQ *X509_REQ_dup(X509_REQ *req);
 X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
 X509_NAME *X509_NAME_dup(X509_NAME *xn);
 X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
+#ifndef NO_RSA
 RSA *RSAPublicKey_dup(RSA *rsa);
 RSA *RSAPrivateKey_dup(RSA *rsa);
+#endif
 
 #endif /* !SSLEAY_MACROS */
 
@@ -885,336 +887,17 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
 
 /* Password based encryption routines */
 
-int EVP_PBE_ALGOR_CipherInit(X509_ALGOR *algor, unsigned char *pass,
-                                int passlen, EVP_CIPHER_CTX *ctx, int en_de);
+int EVP_PBE_ALGOR_CipherInit(X509_ALGOR *algor, const char *pass,
+                            int passlen, EVP_CIPHER_CTX *ctx, int en_de);
 int EVP_PBE_alg_add(int nid, EVP_CIPHER *cipher, EVP_MD *md,
-                                                EVP_PBE_KEYGEN *keygen);
+                   EVP_PBE_KEYGEN *keygen);
 void EVP_PBE_cleanup(void);
 
-#else
-
-#ifndef SSLEAY_MACROS
-#ifdef HEADER_ENVELOPE_H
-int X509_verify();
-int X509_REQ_verify();
-int X509_CRL_verify();
-int NETSCAPE_SPKI_verify();
-
-int X509_sign();
-int X509_REQ_sign();
-int X509_CRL_sign();
-int NETSCAPE_SPKI_sign();
-
-int X509_digest();
-int X509_NAME_digest();
-#endif
-
-#ifndef NO_FP_API
-X509 *d2i_X509_fp();
-int i2d_X509_fp();
-X509_CRL *d2i_X509_CRL_fp();
-int i2d_X509_CRL_fp();
-X509_REQ *d2i_X509_REQ_fp();
-int i2d_X509_REQ_fp();
-RSA *d2i_RSAPrivateKey_fp();
-int i2d_RSAPrivateKey_fp();
-DSA *d2i_DSAPrivateKey_fp();
-int i2d_DSAPrivateKey_fp();
-RSA *d2i_RSAPublicKey_fp();
-int i2d_RSAPublicKey_fp();
-#endif
-
-X509 *d2i_X509_bio();
-int i2d_X509_bio();
-X509_CRL *d2i_X509_CRL_bio();
-int i2d_X509_CRL_bio();
-X509_REQ *d2i_X509_REQ_bio();
-int i2d_X509_REQ_bio();
-RSA *d2i_RSAPrivateKey_bio();
-int i2d_RSAPrivateKey_bio();
-DSA *d2i_DSAPrivateKey_bio();
-int i2d_DSAPrivateKey_bio();
-RSA *d2i_RSAPublicKey_bio();
-int i2d_RSAPublicKey_bio();
-
-X509 *X509_dup();
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup();
-X509_EXTENSION *X509_EXTENSION_dup();
-X509_CRL *X509_CRL_dup();
-X509_REQ *X509_REQ_dup();
-X509_NAME *X509_NAME_dup();
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup();
-RSA *RSAPublicKey_dup();
-RSA *RSAPrivateKey_dup();
-
-#endif /* !SSLEAY_MACROS */
-
-int            X509_cmp_current_time();
-ASN1_UTCTIME * X509_gmtime_adj();
-
-char *         X509_get_default_cert_area();
-char *         X509_get_default_cert_dir();
-char *         X509_get_default_cert_file();
-char *         X509_get_default_cert_dir_env();
-char *         X509_get_default_cert_file_env();
-char *         X509_get_default_private_dir();
-
-X509_REQ *     X509_to_X509_REQ();
-X509 *         X509_REQ_to_X509();
-void ERR_load_X509_strings();
-
-X509_ALGOR *   X509_ALGOR_new();
-void           X509_ALGOR_free();
-int            i2d_X509_ALGOR();
-X509_ALGOR *   d2i_X509_ALGOR();
-
-X509_VAL *     X509_VAL_new();
-void           X509_VAL_free();
-int            i2d_X509_VAL();
-X509_VAL *     d2i_X509_VAL();
-
-X509_PUBKEY *  X509_PUBKEY_new();
-void           X509_PUBKEY_free();
-int            i2d_X509_PUBKEY();
-X509_PUBKEY *  d2i_X509_PUBKEY();
-int            X509_PUBKEY_set();
-EVP_PKEY *     X509_PUBKEY_get();
-int            X509_get_pubkey_parameters();
-
-X509_SIG *     X509_SIG_new();
-void           X509_SIG_free();
-int            i2d_X509_SIG();
-X509_SIG *     d2i_X509_SIG();
-
-X509_REQ_INFO *X509_REQ_INFO_new();
-void           X509_REQ_INFO_free();
-int            i2d_X509_REQ_INFO();
-X509_REQ_INFO *d2i_X509_REQ_INFO();
-
-X509_REQ *     X509_REQ_new();
-void           X509_REQ_free();
-int            i2d_X509_REQ();
-X509_REQ *     d2i_X509_REQ();
-
-X509_ATTRIBUTE *X509_ATTRIBUTE_new();
-void           X509_ATTRIBUTE_free();
-int            i2d_X509_ATTRIBUTE();
-X509_ATTRIBUTE *d2i_X509_ATTRIBUTE();
-X509_ATTRIBUTE *X509_ATTRIBUTE_create();
-
-X509_EXTENSION *X509_EXTENSION_new();
-void           X509_EXTENSION_free();
-int            i2d_X509_EXTENSION();
-X509_EXTENSION *d2i_X509_EXTENSION();
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_new();
-void           X509_NAME_ENTRY_free();
-int            i2d_X509_NAME_ENTRY();
-X509_NAME_ENTRY *d2i_X509_NAME_ENTRY();
-
-X509_NAME *    X509_NAME_new();
-void           X509_NAME_free();
-int            i2d_X509_NAME();
-X509_NAME *    d2i_X509_NAME();
-int            X509_NAME_set();
-
-
-X509_CINF *    X509_CINF_new();
-void           X509_CINF_free();
-int            i2d_X509_CINF();
-X509_CINF *    d2i_X509_CINF();
-
-X509 *         X509_new();
-void           X509_free();
-int            i2d_X509();
-X509 *         d2i_X509();
-
-X509_REVOKED * X509_REVOKED_new();
-void           X509_REVOKED_free();
-int            i2d_X509_REVOKED();
-X509_REVOKED * d2i_X509_REVOKED();
-
-X509_CRL_INFO *X509_CRL_INFO_new();
-void           X509_CRL_INFO_free();
-int            i2d_X509_CRL_INFO();
-X509_CRL_INFO *d2i_X509_CRL_INFO();
-
-X509_CRL *     X509_CRL_new();
-void           X509_CRL_free();
-int            i2d_X509_CRL();
-X509_CRL *     d2i_X509_CRL();
-
-X509_PKEY *    X509_PKEY_new();
-void           X509_PKEY_free();
-int            i2d_X509_PKEY();
-X509_PKEY *    d2i_X509_PKEY();
-
-NETSCAPE_SPKI *        NETSCAPE_SPKI_new();
-void           NETSCAPE_SPKI_free();
-int            i2d_NETSCAPE_SPKI();
-NETSCAPE_SPKI *        d2i_NETSCAPE_SPKI();
-
-NETSCAPE_SPKAC *NETSCAPE_SPKAC_new();
-void           NETSCAPE_SPKAC_free();
-int            i2d_NETSCAPE_SPKAC();
-NETSCAPE_SPKAC *d2i_NETSCAPE_SPKAC();
-
-int i2d_NETSCAPE_CERT_SEQUENCE();
-NETSCAPE_CERT_SEQUENCE *NETSCAPE_CERT_SEQUENCE_new();
-NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE();
-void NETSCAPE_CERT_SEQUENCE_free();
-
-#ifdef HEADER_ENVELOPE_H
-X509_INFO *    X509_INFO_new();
-void           X509_INFO_free();
-#endif
-
-char *         X509_NAME_oneline();
-
-int ASN1_verify();
-int ASN1_digest();
-int ASN1_sign();
-
-int            X509_set_version();
-int            X509_set_serialNumber();
-ASN1_INTEGER * X509_get_serialNumber();
-int            X509_set_issuer_name();
-X509_NAME *    X509_get_issuer_name();
-int            X509_set_subject_name();
-X509_NAME *    X509_get_subject_name();
-int            X509_set_notBefore();
-int            X509_set_notAfter();
-int            X509_set_pubkey();
-EVP_PKEY *     X509_get_pubkey();
-int            X509_certificate_type();
-
-int            X509_REQ_set_version();
-int            X509_REQ_set_subject_name();
-int            X509_REQ_set_pubkey();
-EVP_PKEY *     X509_REQ_get_pubkey();
-
-int            X509_check_private_key();
-
-int            X509_issuer_and_serial_cmp();
-unsigned long  X509_issuer_and_serial_hash();
-
-int            X509_issuer_name_cmp();
-unsigned long  X509_issuer_name_hash();
-
-int            X509_subject_name_cmp();
-unsigned long  X509_subject_name_hash();
-
-int            X509_NAME_cmp ();
-unsigned long  X509_NAME_hash();
-
-int            X509_CRL_cmp();
-#ifndef NO_FP_API
-int            X509_print_fp();
-int            X509_CRL_print_fp();
-int            X509_REQ_print_fp();
-#endif
-
-int            X509_NAME_print();
-int            X509_print();
-int            X509_CRL_print();
-int            X509_REQ_print();
-
-int            X509_NAME_entry_count();
-int            X509_NAME_get_text_by_NID();
-int            X509_NAME_get_text_by_OBJ();
-
-int            X509_NAME_get_index_by_NID();
-int            X509_NAME_get_index_by_OBJ();
-X509_NAME_ENTRY *X509_NAME_get_entry();
-X509_NAME_ENTRY *X509_NAME_delete_entry();
-int            X509_NAME_add_entry();
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID();
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ();
-int            X509_NAME_ENTRY_set_object();
-int            X509_NAME_ENTRY_set_data();
-ASN1_OBJECT *  X509_NAME_ENTRY_get_object();
-ASN1_STRING *  X509_NAME_ENTRY_get_data();
-
-int            X509v3_get_ext_count();
-int            X509v3_get_ext_by_NID();
-int            X509v3_get_ext_by_OBJ();
-int            X509v3_get_ext_by_critical();
-X509_EXTENSION *X509v3_get_ext();
-X509_EXTENSION *X509v3_delete_ext();
-STACK *                X509v3_add_ext();
-
-int            X509_get_ext_count();
-int            X509_get_ext_by_NID();
-int            X509_get_ext_by_OBJ();
-int            X509_get_ext_by_critical();
-X509_EXTENSION *X509_get_ext();
-X509_EXTENSION *X509_delete_ext();
-int            X509_add_ext();
-
-int            X509_CRL_get_ext_count();
-int            X509_CRL_get_ext_by_NID();
-int            X509_CRL_get_ext_by_OBJ();
-int            X509_CRL_get_ext_by_critical();
-X509_EXTENSION *X509_CRL_get_ext();
-X509_EXTENSION *X509_CRL_delete_ext();
-int            X509_CRL_add_ext();
-
-int            X509_REVOKED_get_ext_count();
-int            X509_REVOKED_get_ext_by_NID();
-int            X509_REVOKED_get_ext_by_OBJ();
-int            X509_REVOKED_get_ext_by_critical();
-X509_EXTENSION *X509_REVOKED_get_ext();
-X509_EXTENSION *X509_REVOKED_delete_ext();
-int            X509_REVOKED_add_ext();
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID();
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ();
-int            X509_EXTENSION_set_object();
-int            X509_EXTENSION_set_critical();
-int            X509_EXTENSION_set_data();
-ASN1_OBJECT *  X509_EXTENSION_get_object();
-ASN1_OCTET_STRING *X509_EXTENSION_get_data();
-int            X509_EXTENSION_get_critical();
-
-int            X509_verify_cert();
-char *          X509_verify_cert_error_string();
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial();
-X509 *X509_find_by_subject();
-
-int i2d_PBEPARAM();
-PBEPARAM *PBEPARAM_new();
-PBEPARAM *d2i_PBEPARAM();
-void PBEPARAM_free();
-
-int i2d_PBKDF2PARAM();
-PBKDF2PARAM *PBKDF2PARAM_new();
-PBKDF2PARAM *d2i_PBKDF2PARAM();
-void PBKDF2PARAM_free();
-
-int i2d_PBE2PARAM();
-PBE2PARAM *PBE2PARAM_new();
-PBE2PARAM *d2i_PBE2PARAM();
-void PBE2PARAM_free();
-
-int i2d_PKCS8_PRIV_KEY_INFO();
-PKCS8_PRIV_KEY_INFO *PKCS8_PRIV_KEY_INFO_new();
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO();
-void PKCS8_PRIV_KEY_INFO_free();
-
-EVP_PKEY *EVP_PKCS82PKEY();
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8();
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken();
-
-int EVP_PBE_ALGOR_CipherInit();
-int EVP_PBE_alg_add();
-X509_ALGOR *PKCS5_pbe_set();
-void EVP_PBE_cleanup();
-
-#endif
-
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
 /* Error codes for the X509 functions. */
 
 /* Function codes. */
@@ -1263,7 +946,7 @@ void EVP_PBE_cleanup();
 #define X509_R_UNKNOWN_NID                              109
 #define X509_R_UNSUPPORTED_ALGORITHM                    111
 #define X509_R_WRONG_LOOKUP_TYPE                        112
+
 #ifdef  __cplusplus
 }
 #endif