The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index 4b2a568..150b090 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -20,25 +20,25 @@
* 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_ENTROPY_C) && \
- defined(POLARSSL_SHA256_C) && \
- defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) && \
- defined(POLARSSL_CTR_DRBG_C)
+#if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ENTROPY_C) && \
+ defined(MBEDTLS_SHA256_C) && \
+ defined(MBEDTLS_PK_PARSE_C) && defined(MBEDTLS_FS_IO) && \
+ defined(MBEDTLS_CTR_DRBG_C)
#include "mbedtls/error.h"
#include "mbedtls/entropy.h"
#include "mbedtls/ctr_drbg.h"
@@ -54,16 +54,16 @@
#define snprintf _snprintf
#endif
-#if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_ENTROPY_C) || \
- !defined(POLARSSL_SHA256_C) || \
- !defined(POLARSSL_PK_PARSE_C) || !defined(POLARSSL_FS_IO) || \
- !defined(POLARSSL_CTR_DRBG_C)
+#if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) || \
+ !defined(MBEDTLS_SHA256_C) || \
+ !defined(MBEDTLS_PK_PARSE_C) || !defined(MBEDTLS_FS_IO) || \
+ !defined(MBEDTLS_CTR_DRBG_C)
int main( void )
{
- polarssl_printf("POLARSSL_BIGNUM_C and/or POLARSSL_ENTROPY_C and/or "
- "POLARSSL_SHA256_C and/or "
- "POLARSSL_PK_PARSE_C and/or POLARSSL_FS_IO and/or "
- "POLARSSL_CTR_DRBG_C not defined.\n");
+ mbedtls_printf("MBEDTLS_BIGNUM_C and/or MBEDTLS_ENTROPY_C and/or "
+ "MBEDTLS_SHA256_C and/or "
+ "MBEDTLS_PK_PARSE_C and/or MBEDTLS_FS_IO and/or "
+ "MBEDTLS_CTR_DRBG_C not defined.\n");
return( 0 );
}
#else
@@ -71,47 +71,47 @@
{
FILE *f;
int ret = 1;
- pk_context pk;
- entropy_context entropy;
- ctr_drbg_context ctr_drbg;
+ mbedtls_pk_context pk;
+ mbedtls_entropy_context entropy;
+ mbedtls_ctr_drbg_context ctr_drbg;
unsigned char hash[20];
- unsigned char buf[POLARSSL_MPI_MAX_SIZE];
+ unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
char filename[512];
- const char *pers = "pk_sign";
+ const char *pers = "mbedtls_pk_sign";
size_t olen = 0;
- entropy_init( &entropy );
- pk_init( &pk );
+ mbedtls_entropy_init( &entropy );
+ mbedtls_pk_init( &pk );
if( argc != 3 )
{
- polarssl_printf( "usage: pk_sign <key_file> <filename>\n" );
+ mbedtls_printf( "usage: mbedtls_pk_sign <key_file> <filename>\n" );
#if defined(_WIN32)
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
#endif
goto exit;
}
- polarssl_printf( "\n . Seeding the random number generator..." );
+ mbedtls_printf( "\n . Seeding the random number generator..." );
fflush( stdout );
- if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
+ if( ( ret = mbedtls_ctr_drbg_init( &ctr_drbg, mbedtls_entropy_func, &entropy,
(const unsigned char *) pers,
strlen( pers ) ) ) != 0 )
{
- polarssl_printf( " failed\n ! ctr_drbg_init returned -0x%04x\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_init returned -0x%04x\n", -ret );
goto exit;
}
- polarssl_printf( "\n . Reading private key from '%s'", argv[1] );
+ mbedtls_printf( "\n . Reading private key from '%s'", argv[1] );
fflush( stdout );
- if( ( ret = pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
+ if( ( ret = mbedtls_pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
{
ret = 1;
- polarssl_printf( " failed\n ! Could not open '%s'\n", argv[1] );
+ mbedtls_printf( " failed\n ! Could not open '%s'\n", argv[1] );
goto exit;
}
@@ -119,61 +119,61 @@
* Compute the SHA-256 hash of the input file,
* then calculate the signature of the hash.
*/
- polarssl_printf( "\n . Generating the SHA-256 signature" );
+ mbedtls_printf( "\n . Generating 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_sign( &pk, POLARSSL_MD_SHA256, hash, 0, buf, &olen,
- ctr_drbg_random, &ctr_drbg ) ) != 0 )
+ if( ( ret = mbedtls_pk_sign( &pk, MBEDTLS_MD_SHA256, hash, 0, buf, &olen,
+ mbedtls_ctr_drbg_random, &ctr_drbg ) ) != 0 )
{
- polarssl_printf( " failed\n ! pk_sign returned -0x%04x\n", -ret );
+ mbedtls_printf( " failed\n ! mbedtls_pk_sign returned -0x%04x\n", -ret );
goto exit;
}
/*
* Write the signature into <filename>-sig.txt
*/
- polarssl_snprintf( filename, sizeof(filename), "%s.sig", argv[2] );
+ mbedtls_snprintf( filename, sizeof(filename), "%s.sig", argv[2] );
if( ( f = fopen( filename, "wb+" ) ) == NULL )
{
ret = 1;
- polarssl_printf( " failed\n ! Could not create %s\n\n", filename );
+ mbedtls_printf( " failed\n ! Could not create %s\n\n", filename );
goto exit;
}
if( fwrite( buf, 1, olen, f ) != olen )
{
- polarssl_printf( "failed\n ! fwrite failed\n\n" );
+ mbedtls_printf( "failed\n ! fwrite failed\n\n" );
goto exit;
}
fclose( f );
- polarssl_printf( "\n . Done (created \"%s\")\n\n", filename );
+ mbedtls_printf( "\n . Done (created \"%s\")\n\n", filename );
exit:
- pk_free( &pk );
- ctr_drbg_free( &ctr_drbg );
- entropy_free( &entropy );
+ mbedtls_pk_free( &pk );
+ mbedtls_ctr_drbg_free( &ctr_drbg );
+ mbedtls_entropy_free( &entropy );
-#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_ENTROPY_C &&
- POLARSSL_SHA256_C && POLARSSL_PK_PARSE_C && POLARSSL_FS_IO &&
- POLARSSL_CTR_DRBG_C */
+#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C &&
+ MBEDTLS_SHA256_C && MBEDTLS_PK_PARSE_C && MBEDTLS_FS_IO &&
+ MBEDTLS_CTR_DRBG_C */