The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index d9960d2..3c0c526 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -20,23 +20,23 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#if !defined(POLARSSL_CONFIG_FILE)
+#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"
#else
-#include POLARSSL_CONFIG_FILE
+#include MBEDTLS_CONFIG_FILE
#endif
-#if defined(POLARSSL_PLATFORM_C)
+#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
-#define polarssl_snprintf snprintf
-#define polarssl_printf printf
-#define polarssl_snprintf snprintf
+#define mbedtls_snprintf snprintf
+#define mbedtls_printf printf
+#define mbedtls_snprintf snprintf
#endif
-#if defined(POLARSSL_RSA_C) && defined(POLARSSL_X509_CRT_PARSE_C) && \
- defined(POLARSSL_FS_IO) && defined(POLARSSL_X509_CRL_PARSE_C)
+#if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_X509_CRT_PARSE_C) && \
+ defined(MBEDTLS_FS_IO) && defined(MBEDTLS_X509_CRL_PARSE_C)
#include "mbedtls/certs.h"
#include "mbedtls/x509_crt.h"
@@ -50,12 +50,12 @@
#define MAX_CLIENT_CERTS 8
-#if !defined(POLARSSL_RSA_C) || !defined(POLARSSL_X509_CRT_PARSE_C) || \
- !defined(POLARSSL_FS_IO) || !defined(POLARSSL_X509_CRL_PARSE_C)
+#if !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) || \
+ !defined(MBEDTLS_FS_IO) || !defined(MBEDTLS_X509_CRL_PARSE_C)
int main( void )
{
- polarssl_printf("POLARSSL_RSA_C and/or POLARSSL_X509_CRT_PARSE_C "
- "POLARSSL_FS_IO and/or POLARSSL_X509_CRL_PARSE_C "
+ mbedtls_printf("MBEDTLS_RSA_C and/or MBEDTLS_X509_CRT_PARSE_C "
+ "MBEDTLS_FS_IO and/or MBEDTLS_X509_CRL_PARSE_C "
"not defined.\n");
return( 0 );
}
@@ -87,52 +87,52 @@
int main( void )
{
int ret, i;
- x509_crt cacert;
- x509_crl crl;
+ mbedtls_x509_crt cacert;
+ mbedtls_x509_crl crl;
char buf[10240];
- x509_crt_init( &cacert );
- x509_crl_init( &crl );
+ mbedtls_x509_crt_init( &cacert );
+ mbedtls_x509_crl_init( &crl );
/*
* 1.1. Load the trusted CA
*/
- polarssl_printf( "\n . Loading the CA root certificate ..." );
+ mbedtls_printf( "\n . Loading the CA root certificate ..." );
fflush( stdout );
/*
* Alternatively, you may load the CA certificates from a .pem or
- * .crt file by calling x509_crt_parse_file( &cacert, "myca.crt" ).
+ * .crt file by calling mbedtls_x509_crt_parse_file( &cacert, "myca.crt" ).
*/
- ret = x509_crt_parse_file( &cacert, "ssl/test-ca/test-ca.crt" );
+ ret = mbedtls_x509_crt_parse_file( &cacert, "ssl/test-ca/test-ca.crt" );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! x509_crt_parse_file returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crt_parse_file returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
- x509_crt_info( buf, 1024, "CRT: ", &cacert );
- polarssl_printf("%s\n", buf );
+ mbedtls_x509_crt_info( buf, 1024, "CRT: ", &cacert );
+ mbedtls_printf("%s\n", buf );
/*
* 1.2. Load the CRL
*/
- polarssl_printf( " . Loading the CRL ..." );
+ mbedtls_printf( " . Loading the CRL ..." );
fflush( stdout );
- ret = x509_crl_parse_file( &crl, "ssl/test-ca/crl.pem" );
+ ret = mbedtls_x509_crl_parse_file( &crl, "ssl/test-ca/crl.pem" );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! x509_crl_parse_file returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crl_parse_file returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
- x509_crl_info( buf, 1024, "CRL: ", &crl );
- polarssl_printf("%s\n", buf );
+ mbedtls_x509_crl_info( buf, 1024, "CRL: ", &crl );
+ mbedtls_printf("%s\n", buf );
for( i = 0; i < MAX_CLIENT_CERTS; i++ )
{
@@ -141,127 +141,127 @@
*/
char name[512];
int flags;
- x509_crt clicert;
- pk_context pk;
+ mbedtls_x509_crt clicert;
+ mbedtls_pk_context pk;
- x509_crt_init( &clicert );
- pk_init( &pk );
+ mbedtls_x509_crt_init( &clicert );
+ mbedtls_pk_init( &pk );
- polarssl_snprintf(name, 512, "ssl/test-ca/%s", client_certificates[i]);
+ mbedtls_snprintf(name, 512, "ssl/test-ca/%s", client_certificates[i]);
- polarssl_printf( " . Loading the client certificate %s...", name );
+ mbedtls_printf( " . Loading the client certificate %s...", name );
fflush( stdout );
- ret = x509_crt_parse_file( &clicert, name );
+ ret = mbedtls_x509_crt_parse_file( &clicert, name );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! x509_crt_parse_file returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crt_parse_file returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 1.4. Verify certificate validity with CA certificate
*/
- polarssl_printf( " . Verify the client certificate with CA certificate..." );
+ mbedtls_printf( " . Verify the client certificate with CA certificate..." );
fflush( stdout );
- ret = x509_crt_verify( &clicert, &cacert, &crl, NULL, &flags, NULL,
+ ret = mbedtls_x509_crt_verify( &clicert, &cacert, &crl, NULL, &flags, NULL,
NULL );
if( ret != 0 )
{
- if( ret == POLARSSL_ERR_X509_CERT_VERIFY_FAILED )
+ if( ret == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED )
{
- if( flags & BADCERT_CN_MISMATCH )
- polarssl_printf( " CN_MISMATCH " );
- if( flags & BADCERT_EXPIRED )
- polarssl_printf( " EXPIRED " );
- if( flags & BADCERT_REVOKED )
- polarssl_printf( " REVOKED " );
- if( flags & BADCERT_NOT_TRUSTED )
- polarssl_printf( " NOT_TRUSTED " );
- if( flags & BADCRL_NOT_TRUSTED )
- polarssl_printf( " CRL_NOT_TRUSTED " );
- if( flags & BADCRL_EXPIRED )
- polarssl_printf( " CRL_EXPIRED " );
+ if( flags & MBEDTLS_X509_BADCERT_CN_MISMATCH )
+ mbedtls_printf( " CN_MISMATCH " );
+ if( flags & MBEDTLS_BADCERT_EXPIRED )
+ mbedtls_printf( " EXPIRED " );
+ if( flags & MBEDTLS_X509_BADCERT_REVOKED )
+ mbedtls_printf( " REVOKED " );
+ if( flags & MBEDTLS_X509_BADCERT_NOT_TRUSTED )
+ mbedtls_printf( " NOT_TRUSTED " );
+ if( flags & MBEDTLS_X509_BADCRL_NOT_TRUSTED )
+ mbedtls_printf( " CRL_NOT_TRUSTED " );
+ if( flags & MBEDTLS_X509_BADCRL_EXPIRED )
+ mbedtls_printf( " CRL_EXPIRED " );
} else {
- polarssl_printf( " failed\n ! x509_crt_verify returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_x509_crt_verify returned %d\n\n", ret );
goto exit;
}
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 1.5. Load own private key
*/
- polarssl_snprintf(name, 512, "ssl/test-ca/%s", client_private_keys[i]);
+ mbedtls_snprintf(name, 512, "ssl/test-ca/%s", client_private_keys[i]);
- polarssl_printf( " . Loading the client private key %s...", name );
+ mbedtls_printf( " . Loading the client private key %s...", name );
fflush( stdout );
- ret = pk_parse_keyfile( &pk, name, NULL );
+ ret = mbedtls_pk_parse_keyfile( &pk, name, NULL );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! pk_parse_keyfile returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_pk_parse_keyfile returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
/*
* 1.6. Verify certificate validity with private key
*/
- polarssl_printf( " . Verify the client certificate with private key..." );
+ mbedtls_printf( " . Verify the client certificate with private key..." );
fflush( stdout );
/* EC NOT IMPLEMENTED YET */
- if( ! pk_can_do( &clicert.pk, POLARSSL_PK_RSA ) )
+ if( ! mbedtls_pk_can_do( &clicert.pk, MBEDTLS_PK_RSA ) )
{
- polarssl_printf( " failed\n ! certificate's key is not RSA\n\n" );
- ret = POLARSSL_ERR_X509_FEATURE_UNAVAILABLE;
+ mbedtls_printf( " failed\n ! certificate's key is not RSA\n\n" );
+ ret = MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE;
goto exit;
}
- ret = mpi_cmp_mpi(&pk_rsa( pk )->N, &pk_rsa( clicert.pk )->N);
+ ret = mbedtls_mpi_cmp_mpi(&mbedtls_pk_rsa( pk )->N, &mbedtls_pk_rsa( clicert.pk )->N);
if( ret != 0 )
{
- polarssl_printf( " failed\n ! mpi_cmp_mpi for N returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_mpi_cmp_mpi for N returned %d\n\n", ret );
goto exit;
}
- ret = mpi_cmp_mpi(&pk_rsa( pk )->E, &pk_rsa( clicert.pk )->E);
+ ret = mbedtls_mpi_cmp_mpi(&mbedtls_pk_rsa( pk )->E, &mbedtls_pk_rsa( clicert.pk )->E);
if( ret != 0 )
{
- polarssl_printf( " failed\n ! mpi_cmp_mpi for E returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_mpi_cmp_mpi for E returned %d\n\n", ret );
goto exit;
}
- ret = rsa_check_privkey( pk_rsa( pk ) );
+ ret = mbedtls_rsa_check_privkey( mbedtls_pk_rsa( pk ) );
if( ret != 0 )
{
- polarssl_printf( " failed\n ! rsa_check_privkey returned %d\n\n", ret );
+ mbedtls_printf( " failed\n ! mbedtls_rsa_check_privkey returned %d\n\n", ret );
goto exit;
}
- polarssl_printf( " ok\n" );
+ mbedtls_printf( " ok\n" );
- x509_crt_free( &clicert );
- pk_free( &pk );
+ mbedtls_x509_crt_free( &clicert );
+ mbedtls_pk_free( &pk );
}
exit:
- x509_crt_free( &cacert );
- x509_crl_free( &crl );
+ mbedtls_x509_crt_free( &cacert );
+ mbedtls_x509_crl_free( &crl );
#if defined(_WIN32)
- polarssl_printf( " + Press Enter to exit this program.\n" );
+ mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
#endif
return( ret );
}
-#endif /* POLARSSL_RSA_C && POLARSSL_X509_CRT_PARSE_C && POLARSSL_FS_IO &&
- POLARSSL_X509_CRL_PARSE_C */
+#endif /* MBEDTLS_RSA_C && MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_FS_IO &&
+ MBEDTLS_X509_CRL_PARSE_C */