The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c
index a9c6645..8c69dc3 100644
--- a/programs/pkey/pk_verify.c
+++ b/programs/pkey/pk_verify.c
@@ -20,24 +20,24 @@
* 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_BIGNUM_C) && \
- defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) && \
- defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_BIGNUM_C) && \
+ defined(MBEDTLS_SHA256_C) && defined(MBEDTLS_PK_PARSE_C) && \
+ defined(MBEDTLS_FS_IO)
#include "mbedtls/error.h"
#include "mbedtls/md.h"
#include "mbedtls/pk.h"
@@ -51,14 +51,14 @@
#define snprintf _snprintf
#endif
-#if !defined(POLARSSL_BIGNUM_C) || \
- !defined(POLARSSL_SHA256_C) || !defined(POLARSSL_PK_PARSE_C) || \
- !defined(POLARSSL_FS_IO)
+#if !defined(MBEDTLS_BIGNUM_C) || \
+ !defined(MBEDTLS_SHA256_C) || !defined(MBEDTLS_PK_PARSE_C) || \
+ !defined(MBEDTLS_FS_IO)
int main( void )
{
- polarssl_printf("POLARSSL_BIGNUM_C and/or "
- "POLARSSL_SHA256_C and/or POLARSSL_PK_PARSE_C and/or "
- "POLARSSL_FS_IO not defined.\n");
+ mbedtls_printf("MBEDTLS_BIGNUM_C and/or "
+ "MBEDTLS_SHA256_C and/or MBEDTLS_PK_PARSE_C and/or "
+ "MBEDTLS_FS_IO not defined.\n");
return( 0 );
}
#else
@@ -67,30 +67,30 @@
FILE *f;
int ret = 1;
size_t i;
- pk_context pk;
+ mbedtls_pk_context pk;
unsigned char hash[20];
- unsigned char buf[POLARSSL_MPI_MAX_SIZE];
+ unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
char filename[512];
- pk_init( &pk );
+ mbedtls_pk_init( &pk );
if( argc != 3 )
{
- polarssl_printf( "usage: pk_verify <key_file> <filename>\n" );
+ mbedtls_printf( "usage: mbedtls_pk_verify <key_file> <filename>\n" );
#if defined(_WIN32)
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
#endif
goto exit;
}
- polarssl_printf( "\n . Reading public key from '%s'", argv[1] );
+ mbedtls_printf( "\n . Reading public key from '%s'", argv[1] );
fflush( stdout );
- if( ( ret = pk_parse_public_keyfile( &pk, argv[1] ) ) != 0 )
+ if( ( ret = mbedtls_pk_parse_public_keyfile( &pk, argv[1] ) ) != 0 )
{
- polarssl_printf( " failed\n ! pk_parse_public_keyfile returned -0x%04x\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_pk_parse_public_keyfile returned -0x%04x\n", -ret );
goto exit;
}
@@ -98,11 +98,11 @@
* Extract the signature from the text file
*/
ret = 1;
- polarssl_snprintf( filename, sizeof(filename), "%s.sig", argv[2] );
+ mbedtls_snprintf( filename, sizeof(filename), "%s.sig", argv[2] );
if( ( f = fopen( filename, "rb" ) ) == NULL )
{
- polarssl_printf( "\n ! Could not open %s\n\n", filename );
+ mbedtls_printf( "\n ! Could not open %s\n\n", filename );
goto exit;
}
@@ -115,40 +115,40 @@
* Compute the SHA-256 hash of the input file and compare
* it with the hash decrypted from the signature.
*/
- polarssl_printf( "\n . Verifying the SHA-256 signature" );
+ mbedtls_printf( "\n . Verifying the SHA-256 signature" );
fflush( stdout );
- if( ( ret = sha1_file( argv[2], hash ) ) != 0 )
+ if( ( ret = mbedtls_sha1_file( argv[2], hash ) ) != 0 )
{
- polarssl_printf( " failed\n ! Could not open or read %s\n\n", argv[2] );
+ mbedtls_printf( " failed\n ! Could not open or read %s\n\n", argv[2] );
goto exit;
}
- if( ( ret = pk_verify( &pk, POLARSSL_MD_SHA256, hash, 0,
+ if( ( ret = mbedtls_pk_verify( &pk, MBEDTLS_MD_SHA256, hash, 0,
buf, i ) ) != 0 )
{
- polarssl_printf( " failed\n ! pk_verify returned -0x%04x\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_pk_verify returned -0x%04x\n", -ret );
goto exit;
}
- polarssl_printf( "\n . OK (the decrypted SHA-256 hash matches)\n\n" );
+ mbedtls_printf( "\n . OK (the decrypted SHA-256 hash matches)\n\n" );
ret = 0;
exit:
- pk_free( &pk );
+ mbedtls_pk_free( &pk );
-#if defined(POLARSSL_ERROR_C)
- polarssl_strerror( ret, (char *) buf, sizeof(buf) );
- polarssl_printf( " ! Last error was: %s\n", buf );
+#if defined(MBEDTLS_ERROR_C)
+ mbedtls_strerror( ret, (char *) buf, sizeof(buf) );
+ mbedtls_printf( " ! Last error was: %s\n", buf );
#endif
#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_BIGNUM_C && POLARSSL_SHA256_C &&
- POLARSSL_PK_PARSE_C && POLARSSL_FS_IO */
+#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_SHA256_C &&
+ MBEDTLS_PK_PARSE_C && MBEDTLS_FS_IO */