commit ddf26b4e3819187b0da9aa561218f01ca40aeeb1
author Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 13:46:23 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 13:46:23 2013 +0200
tree 9e1ae5c8766fd6a47447e808691af4c7445bac75
parent 369d2eb2a27a7401f996dd696890b7092677a3d2

Renamed x509parse_* functions to new form

e.g. x509parse_crtfile -> x509_crt_parse_file

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d0534af..06abe59 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -85,8 +85,8 @@
 
         memset( dst->peer_cert, 0, sizeof(x509_cert) );
 
-        if( ( ret = x509parse_crt( dst->peer_cert, src->peer_cert->raw.p,
-                                   src->peer_cert->raw.len ) != 0 ) )
+        if( ( ret = x509_crt_parse( dst->peer_cert, src->peer_cert->raw.p,
+                                    src->peer_cert->raw.len ) != 0 ) )
         {
             polarssl_free( dst->peer_cert );
             dst->peer_cert = NULL;
@@ -2516,11 +2516,11 @@
             return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
         }
 
-        ret = x509parse_crt_der( ssl->session_negotiate->peer_cert,
-                                 ssl->in_msg + i, n );
+        ret = x509_crt_parse_der( ssl->session_negotiate->peer_cert,
+                                  ssl->in_msg + i, n );
         if( ret != 0 )
         {
-            SSL_DEBUG_RET( 1, " x509parse_crt", ret );
+            SSL_DEBUG_RET( 1, " x509_crt_parse_der", ret );
             return( ret );
         }
 
@@ -2537,10 +2537,10 @@
             return( POLARSSL_ERR_SSL_CA_CHAIN_REQUIRED );
         }
 
-        ret = x509parse_verify( ssl->session_negotiate->peer_cert,
-                                ssl->ca_chain, ssl->ca_crl, ssl->peer_cn,
-                               &ssl->session_negotiate->verify_result,
-                                ssl->f_vrfy, ssl->p_vrfy );
+        ret = x509_crt_verify( ssl->session_negotiate->peer_cert,
+                               ssl->ca_chain, ssl->ca_crl, ssl->peer_cn,
+                              &ssl->session_negotiate->verify_result,
+                               ssl->f_vrfy, ssl->p_vrfy );
 
         if( ret != 0 )
             SSL_DEBUG_RET( 1, "x509_verify_cert", ret );