The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/library/pem.c b/library/pem.c
index c722282..c97e800 100644
--- a/library/pem.c
+++ b/library/pem.c
@@ -20,13 +20,13 @@
* 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_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C)
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
#include "mbedtls/pem.h"
#include "mbedtls/base64.h"
@@ -37,27 +37,27 @@
#include <string.h>
-#if defined(POLARSSL_PLATFORM_C)
+#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdlib.h>
-#define polarssl_malloc malloc
-#define polarssl_free free
+#define mbedtls_malloc malloc
+#define mbedtls_free free
#endif
/* Implementation that should never be optimized out by the compiler */
-static void polarssl_zeroize( void *v, size_t n ) {
+static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = v; while( n-- ) *p++ = 0;
}
-#if defined(POLARSSL_PEM_PARSE_C)
-void pem_init( pem_context *ctx )
+#if defined(MBEDTLS_PEM_PARSE_C)
+void mbedtls_pem_init( mbedtls_pem_context *ctx )
{
- memset( ctx, 0, sizeof( pem_context ) );
+ memset( ctx, 0, sizeof( mbedtls_pem_context ) );
}
-#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) && \
- ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
+ ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
/*
* Read a 16-byte hex string and convert it to binary
*/
@@ -73,7 +73,7 @@
if( *s >= '0' && *s <= '9' ) j = *s - '0'; else
if( *s >= 'A' && *s <= 'F' ) j = *s - '7'; else
if( *s >= 'a' && *s <= 'f' ) j = *s - 'W'; else
- return( POLARSSL_ERR_PEM_INVALID_ENC_IV );
+ return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
k = ( ( i & 1 ) != 0 ) ? j : j << 4;
@@ -87,26 +87,26 @@
unsigned char *iv,
const unsigned char *pwd, size_t pwdlen )
{
- md5_context md5_ctx;
+ mbedtls_md5_context md5_ctx;
unsigned char md5sum[16];
size_t use_len;
- md5_init( &md5_ctx );
+ mbedtls_md5_init( &md5_ctx );
/*
* key[ 0..15] = MD5(pwd || IV)
*/
- md5_starts( &md5_ctx );
- md5_update( &md5_ctx, pwd, pwdlen );
- md5_update( &md5_ctx, iv, 8 );
- md5_finish( &md5_ctx, md5sum );
+ mbedtls_md5_starts( &md5_ctx );
+ mbedtls_md5_update( &md5_ctx, pwd, pwdlen );
+ mbedtls_md5_update( &md5_ctx, iv, 8 );
+ mbedtls_md5_finish( &md5_ctx, md5sum );
if( keylen <= 16 )
{
memcpy( key, md5sum, keylen );
- md5_free( &md5_ctx );
- polarssl_zeroize( md5sum, 16 );
+ mbedtls_md5_free( &md5_ctx );
+ mbedtls_zeroize( md5sum, 16 );
return;
}
@@ -115,11 +115,11 @@
/*
* key[16..23] = MD5(key[ 0..15] || pwd || IV])
*/
- md5_starts( &md5_ctx );
- md5_update( &md5_ctx, md5sum, 16 );
- md5_update( &md5_ctx, pwd, pwdlen );
- md5_update( &md5_ctx, iv, 8 );
- md5_finish( &md5_ctx, md5sum );
+ mbedtls_md5_starts( &md5_ctx );
+ mbedtls_md5_update( &md5_ctx, md5sum, 16 );
+ mbedtls_md5_update( &md5_ctx, pwd, pwdlen );
+ mbedtls_md5_update( &md5_ctx, iv, 8 );
+ mbedtls_md5_finish( &md5_ctx, md5sum );
use_len = 16;
if( keylen < 32 )
@@ -127,11 +127,11 @@
memcpy( key + 16, md5sum, use_len );
- md5_free( &md5_ctx );
- polarssl_zeroize( md5sum, 16 );
+ mbedtls_md5_free( &md5_ctx );
+ mbedtls_zeroize( md5sum, 16 );
}
-#if defined(POLARSSL_DES_C)
+#if defined(MBEDTLS_DES_C)
/*
* Decrypt with DES-CBC, using PBKDF1 for key derivation
*/
@@ -139,19 +139,19 @@
unsigned char *buf, size_t buflen,
const unsigned char *pwd, size_t pwdlen )
{
- des_context des_ctx;
+ mbedtls_des_context des_ctx;
unsigned char des_key[8];
- des_init( &des_ctx );
+ mbedtls_des_init( &des_ctx );
pem_pbkdf1( des_key, 8, des_iv, pwd, pwdlen );
- des_setkey_dec( &des_ctx, des_key );
- des_crypt_cbc( &des_ctx, DES_DECRYPT, buflen,
+ mbedtls_des_setkey_dec( &des_ctx, des_key );
+ mbedtls_des_crypt_cbc( &des_ctx, MBEDTLS_DES_DECRYPT, buflen,
des_iv, buf, buf );
- des_free( &des_ctx );
- polarssl_zeroize( des_key, 8 );
+ mbedtls_des_free( &des_ctx );
+ mbedtls_zeroize( des_key, 8 );
}
/*
@@ -161,23 +161,23 @@
unsigned char *buf, size_t buflen,
const unsigned char *pwd, size_t pwdlen )
{
- des3_context des3_ctx;
+ mbedtls_des3_context des3_ctx;
unsigned char des3_key[24];
- des3_init( &des3_ctx );
+ mbedtls_des3_init( &des3_ctx );
pem_pbkdf1( des3_key, 24, des3_iv, pwd, pwdlen );
- des3_set3key_dec( &des3_ctx, des3_key );
- des3_crypt_cbc( &des3_ctx, DES_DECRYPT, buflen,
+ mbedtls_des3_set3key_dec( &des3_ctx, des3_key );
+ mbedtls_des3_crypt_cbc( &des3_ctx, MBEDTLS_DES_DECRYPT, buflen,
des3_iv, buf, buf );
- des3_free( &des3_ctx );
- polarssl_zeroize( des3_key, 24 );
+ mbedtls_des3_free( &des3_ctx );
+ mbedtls_zeroize( des3_key, 24 );
}
-#endif /* POLARSSL_DES_C */
+#endif /* MBEDTLS_DES_C */
-#if defined(POLARSSL_AES_C)
+#if defined(MBEDTLS_AES_C)
/*
* Decrypt with AES-XXX-CBC, using PBKDF1 for key derivation
*/
@@ -185,26 +185,26 @@
unsigned char *buf, size_t buflen,
const unsigned char *pwd, size_t pwdlen )
{
- aes_context aes_ctx;
+ mbedtls_aes_context aes_ctx;
unsigned char aes_key[32];
- aes_init( &aes_ctx );
+ mbedtls_aes_init( &aes_ctx );
pem_pbkdf1( aes_key, keylen, aes_iv, pwd, pwdlen );
- aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 );
- aes_crypt_cbc( &aes_ctx, AES_DECRYPT, buflen,
+ mbedtls_aes_setkey_dec( &aes_ctx, aes_key, keylen * 8 );
+ mbedtls_aes_crypt_cbc( &aes_ctx, MBEDTLS_AES_DECRYPT, buflen,
aes_iv, buf, buf );
- aes_free( &aes_ctx );
- polarssl_zeroize( aes_key, keylen );
+ mbedtls_aes_free( &aes_ctx );
+ mbedtls_zeroize( aes_key, keylen );
}
-#endif /* POLARSSL_AES_C */
+#endif /* MBEDTLS_AES_C */
-#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
- ( POLARSSL_AES_C || POLARSSL_DES_C ) */
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
-int pem_read_buffer( pem_context *ctx, const char *header, const char *footer,
+int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const char *footer,
const unsigned char *data, const unsigned char *pwd,
size_t pwdlen, size_t *use_len )
{
@@ -212,33 +212,33 @@
size_t len;
unsigned char *buf;
const unsigned char *s1, *s2, *end;
-#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) && \
- ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
+ ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
unsigned char pem_iv[16];
- cipher_type_t enc_alg = POLARSSL_CIPHER_NONE;
+ mbedtls_cipher_type_t enc_alg = MBEDTLS_CIPHER_NONE;
#else
((void) pwd);
((void) pwdlen);
-#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
- ( POLARSSL_AES_C || POLARSSL_DES_C ) */
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
if( ctx == NULL )
- return( POLARSSL_ERR_PEM_BAD_INPUT_DATA );
+ return( MBEDTLS_ERR_PEM_BAD_INPUT_DATA );
s1 = (unsigned char *) strstr( (const char *) data, header );
if( s1 == NULL )
- return( POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+ return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
s2 = (unsigned char *) strstr( (const char *) data, footer );
if( s2 == NULL || s2 <= s1 )
- return( POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+ return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
s1 += strlen( header );
if( *s1 == '\r' ) s1++;
if( *s1 == '\n' ) s1++;
- else return( POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
+ else return( MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
end = s2;
end += strlen( footer );
@@ -250,111 +250,111 @@
if( memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
{
-#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) && \
- ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
+ ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
enc++;
s1 += 22;
if( *s1 == '\r' ) s1++;
if( *s1 == '\n' ) s1++;
- else return( POLARSSL_ERR_PEM_INVALID_DATA );
+ else return( MBEDTLS_ERR_PEM_INVALID_DATA );
-#if defined(POLARSSL_DES_C)
+#if defined(MBEDTLS_DES_C)
if( memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 )
{
- enc_alg = POLARSSL_CIPHER_DES_EDE3_CBC;
+ enc_alg = MBEDTLS_CIPHER_DES_EDE3_CBC;
s1 += 23;
if( pem_get_iv( s1, pem_iv, 8 ) != 0 )
- return( POLARSSL_ERR_PEM_INVALID_ENC_IV );
+ return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
s1 += 16;
}
else if( memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 )
{
- enc_alg = POLARSSL_CIPHER_DES_CBC;
+ enc_alg = MBEDTLS_CIPHER_DES_CBC;
s1 += 18;
if( pem_get_iv( s1, pem_iv, 8) != 0 )
- return( POLARSSL_ERR_PEM_INVALID_ENC_IV );
+ return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
s1 += 16;
}
-#endif /* POLARSSL_DES_C */
+#endif /* MBEDTLS_DES_C */
-#if defined(POLARSSL_AES_C)
+#if defined(MBEDTLS_AES_C)
if( memcmp( s1, "DEK-Info: AES-", 14 ) == 0 )
{
if( memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 )
- enc_alg = POLARSSL_CIPHER_AES_128_CBC;
+ enc_alg = MBEDTLS_CIPHER_AES_128_CBC;
else if( memcmp( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 )
- enc_alg = POLARSSL_CIPHER_AES_192_CBC;
+ enc_alg = MBEDTLS_CIPHER_AES_192_CBC;
else if( memcmp( s1, "DEK-Info: AES-256-CBC,", 22 ) == 0 )
- enc_alg = POLARSSL_CIPHER_AES_256_CBC;
+ enc_alg = MBEDTLS_CIPHER_AES_256_CBC;
else
- return( POLARSSL_ERR_PEM_UNKNOWN_ENC_ALG );
+ return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
s1 += 22;
if( pem_get_iv( s1, pem_iv, 16 ) != 0 )
- return( POLARSSL_ERR_PEM_INVALID_ENC_IV );
+ return( MBEDTLS_ERR_PEM_INVALID_ENC_IV );
s1 += 32;
}
-#endif /* POLARSSL_AES_C */
+#endif /* MBEDTLS_AES_C */
- if( enc_alg == POLARSSL_CIPHER_NONE )
- return( POLARSSL_ERR_PEM_UNKNOWN_ENC_ALG );
+ if( enc_alg == MBEDTLS_CIPHER_NONE )
+ return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
if( *s1 == '\r' ) s1++;
if( *s1 == '\n' ) s1++;
- else return( POLARSSL_ERR_PEM_INVALID_DATA );
+ else return( MBEDTLS_ERR_PEM_INVALID_DATA );
#else
- return( POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE );
-#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
- ( POLARSSL_AES_C || POLARSSL_DES_C ) */
+ return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
}
len = 0;
- ret = base64_decode( NULL, &len, s1, s2 - s1 );
+ ret = mbedtls_base64_decode( NULL, &len, s1, s2 - s1 );
- if( ret == POLARSSL_ERR_BASE64_INVALID_CHARACTER )
- return( POLARSSL_ERR_PEM_INVALID_DATA + ret );
+ if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER )
+ return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
- if( ( buf = polarssl_malloc( len ) ) == NULL )
- return( POLARSSL_ERR_PEM_MALLOC_FAILED );
+ if( ( buf = mbedtls_malloc( len ) ) == NULL )
+ return( MBEDTLS_ERR_PEM_MALLOC_FAILED );
- if( ( ret = base64_decode( buf, &len, s1, s2 - s1 ) ) != 0 )
+ if( ( ret = mbedtls_base64_decode( buf, &len, s1, s2 - s1 ) ) != 0 )
{
- polarssl_free( buf );
- return( POLARSSL_ERR_PEM_INVALID_DATA + ret );
+ mbedtls_free( buf );
+ return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
}
if( enc != 0 )
{
-#if defined(POLARSSL_MD5_C) && defined(POLARSSL_CIPHER_MODE_CBC) && \
- ( defined(POLARSSL_DES_C) || defined(POLARSSL_AES_C) )
+#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
+ ( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
if( pwd == NULL )
{
- polarssl_free( buf );
- return( POLARSSL_ERR_PEM_PASSWORD_REQUIRED );
+ mbedtls_free( buf );
+ return( MBEDTLS_ERR_PEM_PASSWORD_REQUIRED );
}
-#if defined(POLARSSL_DES_C)
- if( enc_alg == POLARSSL_CIPHER_DES_EDE3_CBC )
+#if defined(MBEDTLS_DES_C)
+ if( enc_alg == MBEDTLS_CIPHER_DES_EDE3_CBC )
pem_des3_decrypt( pem_iv, buf, len, pwd, pwdlen );
- else if( enc_alg == POLARSSL_CIPHER_DES_CBC )
+ else if( enc_alg == MBEDTLS_CIPHER_DES_CBC )
pem_des_decrypt( pem_iv, buf, len, pwd, pwdlen );
-#endif /* POLARSSL_DES_C */
+#endif /* MBEDTLS_DES_C */
-#if defined(POLARSSL_AES_C)
- if( enc_alg == POLARSSL_CIPHER_AES_128_CBC )
+#if defined(MBEDTLS_AES_C)
+ if( enc_alg == MBEDTLS_CIPHER_AES_128_CBC )
pem_aes_decrypt( pem_iv, 16, buf, len, pwd, pwdlen );
- else if( enc_alg == POLARSSL_CIPHER_AES_192_CBC )
+ else if( enc_alg == MBEDTLS_CIPHER_AES_192_CBC )
pem_aes_decrypt( pem_iv, 24, buf, len, pwd, pwdlen );
- else if( enc_alg == POLARSSL_CIPHER_AES_256_CBC )
+ else if( enc_alg == MBEDTLS_CIPHER_AES_256_CBC )
pem_aes_decrypt( pem_iv, 32, buf, len, pwd, pwdlen );
-#endif /* POLARSSL_AES_C */
+#endif /* MBEDTLS_AES_C */
/*
* The result will be ASN.1 starting with a SEQUENCE tag, with 1 to 3
@@ -364,14 +364,14 @@
*/
if( len <= 2 || buf[0] != 0x30 || buf[1] > 0x83 )
{
- polarssl_free( buf );
- return( POLARSSL_ERR_PEM_PASSWORD_MISMATCH );
+ mbedtls_free( buf );
+ return( MBEDTLS_ERR_PEM_PASSWORD_MISMATCH );
}
#else
- polarssl_free( buf );
- return( POLARSSL_ERR_PEM_FEATURE_UNAVAILABLE );
-#endif /* POLARSSL_MD5_C && POLARSSL_CIPHER_MODE_CBC &&
- ( POLARSSL_AES_C || POLARSSL_DES_C ) */
+ mbedtls_free( buf );
+ return( MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE );
+#endif /* MBEDTLS_MD5_C && MBEDTLS_CIPHER_MODE_CBC &&
+ ( MBEDTLS_AES_C || MBEDTLS_DES_C ) */
}
ctx->buf = buf;
@@ -380,17 +380,17 @@
return( 0 );
}
-void pem_free( pem_context *ctx )
+void mbedtls_pem_free( mbedtls_pem_context *ctx )
{
- polarssl_free( ctx->buf );
- polarssl_free( ctx->info );
+ mbedtls_free( ctx->buf );
+ mbedtls_free( ctx->info );
- polarssl_zeroize( ctx, sizeof( pem_context ) );
+ mbedtls_zeroize( ctx, sizeof( mbedtls_pem_context ) );
}
-#endif /* POLARSSL_PEM_PARSE_C */
+#endif /* MBEDTLS_PEM_PARSE_C */
-#if defined(POLARSSL_PEM_WRITE_C)
-int pem_write_buffer( const char *header, const char *footer,
+#if defined(MBEDTLS_PEM_WRITE_C)
+int mbedtls_pem_write_buffer( const char *header, const char *footer,
const unsigned char *der_data, size_t der_len,
unsigned char *buf, size_t buf_len, size_t *olen )
{
@@ -398,22 +398,22 @@
unsigned char *encode_buf, *c, *p = buf;
size_t len = 0, use_len = 0, add_len = 0;
- base64_encode( NULL, &use_len, der_data, der_len );
+ mbedtls_base64_encode( NULL, &use_len, der_data, der_len );
add_len = strlen( header ) + strlen( footer ) + ( use_len / 64 ) + 1;
if( use_len + add_len > buf_len )
{
*olen = use_len + add_len;
- return( POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL );
+ return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
}
- if( ( encode_buf = polarssl_malloc( use_len ) ) == NULL )
- return( POLARSSL_ERR_PEM_MALLOC_FAILED );
+ if( ( encode_buf = mbedtls_malloc( use_len ) ) == NULL )
+ return( MBEDTLS_ERR_PEM_MALLOC_FAILED );
- if( ( ret = base64_encode( encode_buf, &use_len, der_data,
+ if( ( ret = mbedtls_base64_encode( encode_buf, &use_len, der_data,
der_len ) ) != 0 )
{
- polarssl_free( encode_buf );
+ mbedtls_free( encode_buf );
return( ret );
}
@@ -437,8 +437,8 @@
*p++ = '\0';
*olen = p - buf;
- polarssl_free( encode_buf );
+ mbedtls_free( encode_buf );
return( 0 );
}
-#endif /* POLARSSL_PEM_WRITE_C */
-#endif /* POLARSSL_PEM_PARSE_C || POLARSSL_PEM_WRITE_C */
+#endif /* MBEDTLS_PEM_WRITE_C */
+#endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
