Renamed x509_cert structure to x509_crt for consistency
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index cc935b4..d6e712b 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -81,7 +81,7 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert cacert;
+ x509_crt cacert;
((void) argc);
((void) argv);
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index b342349..eeeb718 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -115,7 +115,7 @@
/*
* Enabled if debug_level > 1 in code below
*/
-static int my_verify( void *data, x509_cert *crt, int depth, int *flags )
+static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
{
char buf[1024];
((void) data);
@@ -255,8 +255,8 @@
ssl_context ssl;
ssl_session saved_session;
#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_cert cacert;
- x509_cert clicert;
+ x509_crt cacert;
+ x509_crt clicert;
pk_context pkey;
#endif
char *p, *q;
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index 724bf2f..3b24b31 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -103,7 +103,7 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert srvcert;
+ x509_crt srvcert;
pk_context pkey;
((void) argc);
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 970d553..e4ab1f1 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -351,8 +351,8 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert cacert;
- x509_cert clicert;
+ x509_crt cacert;
+ x509_crt clicert;
pk_context pkey;
int i;
size_t n;
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 2b10923..927a5b3 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -95,7 +95,7 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert srvcert;
+ x509_crt srvcert;
pk_context pkey;
#if defined(POLARSSL_SSL_CACHE_C)
ssl_cache_context cache;
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 3a18e13..595880c 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -213,8 +213,8 @@
ctr_drbg_context ctr_drbg;
ssl_context ssl;
#if defined(POLARSSL_X509_CRT_PARSE_C)
- x509_cert cacert;
- x509_cert srvcert;
+ x509_crt cacert;
+ x509_crt srvcert;
pk_context pkey;
#endif
#if defined(POLARSSL_SSL_CACHE_C)
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index 81d81ed..25397d0 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -82,7 +82,7 @@
int main( int argc, char *argv[] )
{
int ret, i;
- x509_cert cacert;
+ x509_crt cacert;
x509_crl crl;
char buf[10240];
@@ -139,7 +139,7 @@
*/
char name[512];
int flags;
- x509_cert clicert;
+ x509_crt clicert;
pk_context pk;
x509_crt_init( &clicert );
diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index eba3483..c8461dc 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -166,7 +166,7 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert srvcert;
+ x509_crt srvcert;
pk_context pkey;
ret = 1;
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index eff906d..6b03266 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -95,7 +95,7 @@
}
}
-static int my_verify( void *data, x509_cert *crt, int depth, int *flags )
+static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
{
char buf[1024];
((void) data);
@@ -156,8 +156,8 @@
entropy_context entropy;
ctr_drbg_context ctr_drbg;
ssl_context ssl;
- x509_cert cacert;
- x509_cert clicert;
+ x509_crt cacert;
+ x509_crt clicert;
pk_context pkey;
int i, j;
int flags, verify = 0;
@@ -267,8 +267,8 @@
if( opt.mode == MODE_FILE )
{
- x509_cert crt;
- x509_cert *cur = &crt;
+ x509_crt crt;
+ x509_crt *cur = &crt;
x509_crt_init( &crt );
/*
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index f020225..2fd415a 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -181,7 +181,7 @@
int main( int argc, char *argv[] )
{
int ret = 0;
- x509_cert issuer_crt;
+ x509_crt issuer_crt;
pk_context loaded_issuer_key, loaded_subject_key;
pk_context *issuer_key = &loaded_issuer_key,
*subject_key = &loaded_subject_key;