Moved PK key parsing from X509 module to PK module
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 371b03a..c78f990 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -250,11 +250,11 @@
printf( "\n . Loading the private key ..." );
fflush( stdout );
- ret = x509parse_keyfile( &key, opt.filename, NULL );
+ ret = pk_parse_keyfile( &key, opt.filename, NULL );
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned %d", ret );
+ printf( " failed\n ! pk_parse_key returned %d", ret );
goto exit;
}
@@ -291,11 +291,11 @@
printf( "\n . Loading the public key ..." );
fflush( stdout );
- ret = x509parse_public_keyfile( &key, opt.filename );
+ ret = pk_parse_public_keyfile( &key, opt.filename );
if( ret != 0 )
{
- printf( " failed\n ! x509parse_public_key returned %d", ret );
+ printf( " failed\n ! pk_parse_public_key returned %d", ret );
goto exit;
}
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index f9989ff..7d25de6 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -626,11 +626,11 @@
#if defined(POLARSSL_FS_IO)
if( strlen( opt.key_file ) )
- ret = x509parse_keyfile( &pkey, opt.key_file, "" );
+ ret = pk_parse_keyfile( &pkey, opt.key_file, "" );
else
#endif
#if defined(POLARSSL_CERTS_C)
- ret = x509parse_key( &pkey, (const unsigned char *) test_cli_key,
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_cli_key,
strlen( test_cli_key ), NULL, 0 );
#else
{
@@ -640,7 +640,7 @@
#endif
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned -0x%x\n\n", -ret );
+ printf( " failed\n ! pk_parse_key returned -0x%x\n\n", -ret );
goto exit;
}
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index 98a518c..b37ddb0 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -158,11 +158,11 @@
}
pk_init( &pkey );
- ret = x509parse_key( &pkey, (const unsigned char *) test_srv_key,
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
strlen( test_srv_key ), NULL, 0 );
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned %d\n\n", ret );
+ printf( " failed\n ! pk_parse_key returned %d\n\n", ret );
goto exit;
}
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index cbd1a00..d0fed72 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -532,11 +532,11 @@
#if defined(POLARSSL_FS_IO)
if( strlen( opt.key_file ) )
- ret = x509parse_keyfile( &pkey, opt.key_file, "" );
+ ret = pk_parse_keyfile( &pkey, opt.key_file, "" );
else
#endif
#if defined(POLARSSL_CERTS_C)
- ret = x509parse_key( &pkey, (const unsigned char *) test_cli_key,
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_cli_key,
strlen( test_cli_key ), NULL, 0 );
#else
{
@@ -546,7 +546,7 @@
#endif
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned %d\n\n", ret );
+ printf( " failed\n ! pk_parse_key returned %d\n\n", ret );
goto exit;
}
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 801c0c6..869c871 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -136,11 +136,11 @@
}
pk_init( &pkey );
- ret = x509parse_key( &pkey, (const unsigned char *) test_srv_key,
- strlen( test_srv_key ), NULL, 0 );
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
+ strlen( test_srv_key ), NULL, 0 );
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned %d\n\n", ret );
+ printf( " failed\n ! pk_parse_key returned %d\n\n", ret );
goto exit;
}
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 8d2a8b3..7e3ced6 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -575,11 +575,11 @@
#if defined(POLARSSL_FS_IO)
if( strlen( opt.key_file ) )
- ret = x509parse_keyfile( &pkey, opt.key_file, "" );
+ ret = pk_parse_keyfile( &pkey, opt.key_file, "" );
else
#endif
#if defined(POLARSSL_CERTS_C)
- ret = x509parse_key( &pkey, (const unsigned char *) test_srv_key,
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
strlen( test_srv_key ), NULL, 0 );
#else
{
@@ -589,7 +589,7 @@
#endif
if( ret != 0 )
{
- printf( " failed\n ! x509parse_key returned -0x%x\n\n", -ret );
+ printf( " failed\n ! pk_parse_key returned -0x%x\n\n", -ret );
goto exit;
}
diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index 797226b..d9f4e2d 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -229,11 +229,11 @@
goto exit;
}
- ret = x509parse_key( &pkey, (const unsigned char *) test_srv_key,
- strlen( test_srv_key ), NULL, 0 );
+ ret = pk_parse_key( &pkey, (const unsigned char *) test_srv_key,
+ strlen( test_srv_key ), NULL, 0 );
if( ret != 0 )
{
- printf( " ! x509parse_key returned %d\n\n", ret );
+ printf( " ! pk_parse_key returned %d\n\n", ret );
goto exit;
}
#endif
diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index c0c014f..f4b139e 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -292,11 +292,11 @@
printf( " . Loading the private key ..." );
fflush( stdout );
- ret = x509parse_keyfile( &key, opt.filename, NULL );
+ ret = pk_parse_keyfile( &key, opt.filename, NULL );
if( ret != 0 )
{
- printf( " failed\n ! x509parse_keyfile returned %d", ret );
+ printf( " failed\n ! pk_parse_keyfile returned %d", ret );
goto exit;
}
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index 37cea58..0b52bb1 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -458,12 +458,12 @@
printf( " . Loading the subject key ..." );
fflush( stdout );
- ret = x509parse_keyfile( &loaded_subject_key, opt.subject_key,
+ ret = pk_parse_keyfile( &loaded_subject_key, opt.subject_key,
opt.subject_pwd );
if( ret != 0 )
{
error_strerror( ret, buf, 1024 );
- printf( " failed\n ! x509parse_keyfile returned -0x%02x - %s\n\n", -ret, buf );
+ printf( " failed\n ! pk_parse_keyfile returned -0x%02x - %s\n\n", -ret, buf );
goto exit;
}
@@ -473,12 +473,12 @@
printf( " . Loading the issuer key ..." );
fflush( stdout );
- ret = x509parse_keyfile( &loaded_issuer_key, opt.issuer_key,
- opt.issuer_pwd );
+ ret = pk_parse_keyfile( &loaded_issuer_key, opt.issuer_key,
+ opt.issuer_pwd );
if( ret != 0 )
{
error_strerror( ret, buf, 1024 );
- printf( " failed\n ! x509parse_keyfile returned -x%02x - %s\n\n", -ret, buf );
+ printf( " failed\n ! pk_parse_keyfile returned -x%02x - %s\n\n", -ret, buf );
goto exit;
}