Renamed x509_cert structure to x509_crt for consistency
diff --git a/include/polarssl/compat-1.2.h b/include/polarssl/compat-1.2.h
index 372f714..b60c932 100644
--- a/include/polarssl/compat-1.2.h
+++ b/include/polarssl/compat-1.2.h
@@ -203,6 +203,8 @@
#if defined(POLARSSL_X509_CRT_PARSE_C)
#define POLARSSL_X509_PARSE_C
#include "x509_crt.h"
+typedef x509_crt x509_cert;
+
inline int x509parse_crt_der( x509_cert *chain, const unsigned char *buf,
size_t buflen ) {
return x509_crt_parse_der( chain, buf, buflen );
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 935a2fc..7335ad3 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -102,7 +102,7 @@
#if defined(POLARSSL_X509_CRT_PARSE_C)
void debug_print_crt( const ssl_context *ssl, int level,
const char *file, int line,
- const char *text, const x509_cert *crt );
+ const char *text, const x509_crt *crt );
#endif
#ifdef __cplusplus
diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 270eb6d..c0515e6 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -33,7 +33,7 @@
#if defined(POLARSSL_PKCS11_C)
-#include "x509.h"
+#include "x509_crt.h"
#include <pkcs11-helper-1.0/pkcs11h-certificate.h>
@@ -65,7 +65,7 @@
*
* \return 0 on success.
*/
-int pkcs11_x509_cert_init( x509_cert *cert, pkcs11h_certificate_t pkcs11h_cert );
+int pkcs11_x509_cert_init( x509_crt *cert, pkcs11h_certificate_t pkcs11h_cert );
/**
* Initialise a pkcs11_context, storing the given certificate. Note that the
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 48ffc1e..7c90987 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -411,7 +411,7 @@
unsigned char master[48]; /*!< the master secret */
#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_cert *peer_cert; /*!< peer X.509 cert chain */
+ x509_crt *peer_cert; /*!< peer X.509 cert chain */
#endif /* POLARSSL_X509_CRT_PARSE_C */
int verify_result; /*!< verification result */
@@ -584,7 +584,7 @@
#endif
#if defined(POLARSSL_X509_CRT_PARSE_C)
- int (*f_vrfy)(void *, x509_cert *, int, int *);
+ int (*f_vrfy)(void *, x509_crt *, int, int *);
void *p_vrfy; /*!< context for verification */
#endif
@@ -647,8 +647,8 @@
int pk_key_own_alloc; /*!< did we allocate pk_key? */
#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_cert *own_cert; /*!< own X.509 certificate */
- x509_cert *ca_chain; /*!< own trusted CA chain */
+ x509_crt *own_cert; /*!< own X.509 certificate */
+ x509_crt *ca_chain; /*!< own trusted CA chain */
const char *peer_cn; /*!< expected peer CN */
#endif /* POLARSSL_X509_CRT_PARSE_C */
#if defined(POLARSSL_X509_CRL_PARSE_C)
@@ -825,7 +825,7 @@
* \param p_vrfy verification parameter
*/
void ssl_set_verify( ssl_context *ssl,
- int (*f_vrfy)(void *, x509_cert *, int, int *),
+ int (*f_vrfy)(void *, x509_crt *, int, int *),
void *p_vrfy );
#endif /* POLARSSL_X509_CRT_PARSE_C */
@@ -956,7 +956,7 @@
* \param ca_crl trusted CA CRLs
* \param peer_cn expected peer CommonName (or NULL)
*/
-void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
+void ssl_set_ca_chain( ssl_context *ssl, x509_crt *ca_chain,
x509_crl *ca_crl, const char *peer_cn );
/**
@@ -970,7 +970,7 @@
* \param own_cert own public certificate chain
* \param pk_key own private key
*/
-void ssl_set_own_cert( ssl_context *ssl, x509_cert *own_cert,
+void ssl_set_own_cert( ssl_context *ssl, x509_crt *own_cert,
pk_context *pk_key );
#if defined(POLARSSL_RSA_C)
@@ -987,7 +987,7 @@
*
* \return 0 on success, or a specific error code.
*/
-int ssl_set_own_cert_rsa( ssl_context *ssl, x509_cert *own_cert,
+int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
rsa_context *rsa_key );
#endif /* POLARSSL_RSA_C */
@@ -1012,7 +1012,7 @@
*
* \return 0 on success, or a specific error code.
*/
-int ssl_set_own_cert_alt( ssl_context *ssl, x509_cert *own_cert,
+int ssl_set_own_cert_alt( ssl_context *ssl, x509_crt *own_cert,
void *rsa_key,
rsa_decrypt_func rsa_decrypt,
rsa_sign_func rsa_sign,
@@ -1293,7 +1293,7 @@
*
* \return the current peer certificate
*/
-const x509_cert *ssl_get_peer_cert( const ssl_context *ssl );
+const x509_crt *ssl_get_peer_cert( const ssl_context *ssl );
#endif /* POLARSSL_X509_CRT_PARSE_C */
/**
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index caefae4..285e69c 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -57,7 +57,7 @@
#define POLARSSL_ERR_X509_INVALID_EXTENSIONS -0x2500 /**< The extension tag or value is invalid. */
#define POLARSSL_ERR_X509_UNKNOWN_VERSION -0x2580 /**< CRT/CRL/CSR has an unsupported version number. */
#define POLARSSL_ERR_X509_UNKNOWN_SIG_ALG -0x2600 /**< Signature algorithm (oid) is unsupported. */
-#define POLARSSL_ERR_X509_SIG_MISMATCH -0x2680 /**< Signature algorithms do not match. (see \c ::x509_cert sig_oid) */
+#define POLARSSL_ERR_X509_SIG_MISMATCH -0x2680 /**< Signature algorithms do not match. (see \c ::x509_crt sig_oid) */
#define POLARSSL_ERR_X509_CERT_VERIFY_FAILED -0x2700 /**< Certificate verification failed, e.g. CRL, CA or signature check failed. */
#define POLARSSL_ERR_X509_CERT_UNKNOWN_FORMAT -0x2780 /**< Format not recognized as DER or PEM. */
#define POLARSSL_ERR_X509_BAD_INPUT_DATA -0x2800 /**< Input invalid. */
diff --git a/include/polarssl/x509_crt.h b/include/polarssl/x509_crt.h
index 9eff330..f5703be 100644
--- a/include/polarssl/x509_crt.h
+++ b/include/polarssl/x509_crt.h
@@ -52,7 +52,7 @@
/**
* Container for an X.509 certificate. The certificate may be chained.
*/
-typedef struct _x509_cert
+typedef struct _x509_crt
{
x509_buf raw; /**< The raw certificate data (DER). */
x509_buf tbs; /**< The raw certificate body (DER). The part that is To Be Signed. */
@@ -92,9 +92,9 @@
md_type_t sig_md; /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
pk_type_t sig_pk /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */;
- struct _x509_cert *next; /**< Next certificate in the CA-chain. */
+ struct _x509_crt *next; /**< Next certificate in the CA-chain. */
}
-x509_cert;
+x509_crt;
#define X509_CRT_VERSION_1 0
#define X509_CRT_VERSION_2 1
@@ -132,7 +132,7 @@
*
* \return 0 if successful, or a specific X509 or PEM error code
*/
-int x509_crt_parse_der( x509_cert *chain, const unsigned char *buf,
+int x509_crt_parse_der( x509_crt *chain, const unsigned char *buf,
size_t buflen );
/**
@@ -149,7 +149,7 @@
* \return 0 if all certificates parsed successfully, a positive number
* if partly successful or a specific X509 or PEM error code
*/
-int x509_crt_parse( x509_cert *chain, const unsigned char *buf, size_t buflen );
+int x509_crt_parse( x509_crt *chain, const unsigned char *buf, size_t buflen );
#if defined(POLARSSL_FS_IO)
/**
@@ -165,7 +165,7 @@
* \return 0 if all certificates parsed successfully, a positive number
* if partly successful or a specific X509 or PEM error code
*/
-int x509_crt_parse_file( x509_cert *chain, const char *path );
+int x509_crt_parse_file( x509_crt *chain, const char *path );
/**
* \brief Load one or more certificate files from a path and add them
@@ -180,7 +180,7 @@
* \return 0 if all certificates parsed successfully, a positive number
* if partly successful or a specific X509 or PEM error code
*/
-int x509_crt_parse_path( x509_cert *chain, const char *path );
+int x509_crt_parse_path( x509_crt *chain, const char *path );
#endif /* POLARSSL_FS_IO */
/**
@@ -196,7 +196,7 @@
* case of an error.
*/
int x509_crt_info( char *buf, size_t size, const char *prefix,
- const x509_cert *crt );
+ const x509_crt *crt );
/**
* \brief Verify the certificate signature
@@ -206,7 +206,7 @@
* the verification callback is called for each
* certificate in the chain (from the trust-ca down to the
* presented crt). The parameters for the callback are:
- * (void *parameter, x509_cert *crt, int certificate_depth,
+ * (void *parameter, x509_crt *crt, int certificate_depth,
* int *flags). With the flags representing current flags for
* that specific certificate and the certificate depth from
* the bottom (Peer cert depth = 0).
@@ -234,11 +234,11 @@
* or another error in case of a fatal error encountered
* during the verification process.
*/
-int x509_crt_verify( x509_cert *crt,
- x509_cert *trust_ca,
+int x509_crt_verify( x509_crt *crt,
+ x509_crt *trust_ca,
x509_crl *ca_crl,
const char *cn, int *flags,
- int (*f_vrfy)(void *, x509_cert *, int, int *),
+ int (*f_vrfy)(void *, x509_crt *, int, int *),
void *p_vrfy );
#if defined(POLARSSL_X509_CRL_PARSE_C)
@@ -251,7 +251,7 @@
* \return 1 if the certificate is revoked, 0 otherwise
*
*/
-int x509_crt_revoked( const x509_cert *crt, const x509_crl *crl );
+int x509_crt_revoked( const x509_crt *crt, const x509_crl *crl );
#endif /* POLARSSL_X509_CRL_PARSE_C */
/**
@@ -259,14 +259,14 @@
*
* \param crt Certificate chain to initialize
*/
-void x509_crt_init( x509_cert *crt );
+void x509_crt_init( x509_crt *crt );
/**
* \brief Unallocate all certificate data
*
* \param crt Certificate chain to free
*/
-void x509_crt_free( x509_cert *crt );
+void x509_crt_free( x509_crt *crt );
#endif /* POLARSSL_X509_CRT_PARSE_C */
/* \} name */