Renamed RMD160 to RIPEMD160
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index f967bf6..c9551af 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -45,7 +45,7 @@
pk_wrap.c
pkparse.c
pkwrite.c
- rmd160.c
+ ripemd160.c
rsa.c
sha1.c
sha256.c
diff --git a/library/Makefile b/library/Makefile
index 9965585..a4126f0 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -51,7 +51,7 @@
padlock.o pbkdf2.o pem.o \
pkcs5.o pkcs11.o pkcs12.o \
pk.o pk_wrap.o pkparse.o \
- pkwrite.o rmd160.o \
+ pkwrite.o ripemd160.o \
rsa.o sha1.o sha256.o \
sha512.o ssl_cache.o ssl_cli.o \
ssl_srv.o ssl_ciphersuites.o \
diff --git a/library/md.c b/library/md.c
index 291219d..5ab0fad 100644
--- a/library/md.c
+++ b/library/md.c
@@ -55,8 +55,8 @@
POLARSSL_MD_MD5,
#endif
-#if defined(POLARSSL_RMD160_C)
- POLARSSL_MD_RMD160,
+#if defined(POLARSSL_RIPEMD160_C)
+ POLARSSL_MD_RIPEMD160,
#endif
#if defined(POLARSSL_SHA1_C)
@@ -99,9 +99,9 @@
if( !strcasecmp( "MD5", md_name ) )
return md_info_from_type( POLARSSL_MD_MD5 );
#endif
-#if defined(POLARSSL_RMD160_C)
- if( !strcasecmp( "RMD160", md_name ) )
- return md_info_from_type( POLARSSL_MD_RMD160 );
+#if defined(POLARSSL_RIPEMD160_C)
+ if( !strcasecmp( "RIPEMD160", md_name ) )
+ return md_info_from_type( POLARSSL_MD_RIPEMD160 );
#endif
#if defined(POLARSSL_SHA1_C)
if( !strcasecmp( "SHA1", md_name ) || !strcasecmp( "SHA", md_name ) )
@@ -138,9 +138,9 @@
case POLARSSL_MD_MD5:
return &md5_info;
#endif
-#if defined(POLARSSL_RMD160_C)
- case POLARSSL_MD_RMD160:
- return &rmd160_info;
+#if defined(POLARSSL_RIPEMD160_C)
+ case POLARSSL_MD_RIPEMD160:
+ return &ripemd160_info;
#endif
#if defined(POLARSSL_SHA1_C)
case POLARSSL_MD_SHA1:
diff --git a/library/md_wrap.c b/library/md_wrap.c
index bc159ba..bca5ab2 100644
--- a/library/md_wrap.c
+++ b/library/md_wrap.c
@@ -45,8 +45,8 @@
#include "polarssl/md5.h"
#endif
-#if defined(POLARSSL_RMD160_C)
-#include "polarssl/rmd160.h"
+#if defined(POLARSSL_RIPEMD160_C)
+#include "polarssl/ripemd160.h"
#endif
#if defined(POLARSSL_SHA1_C)
@@ -324,27 +324,27 @@
#endif
-#if defined(POLARSSL_RMD160_C)
+#if defined(POLARSSL_RIPEMD160_C)
-static void rmd160_starts_wrap( void *ctx )
+static void ripemd160_starts_wrap( void *ctx )
{
- rmd160_starts( (rmd160_context *) ctx );
+ ripemd160_starts( (ripemd160_context *) ctx );
}
-static void rmd160_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void ripemd160_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
{
- rmd160_update( (rmd160_context *) ctx, input, ilen );
+ ripemd160_update( (ripemd160_context *) ctx, input, ilen );
}
-static void rmd160_finish_wrap( void *ctx, unsigned char *output )
+static void ripemd160_finish_wrap( void *ctx, unsigned char *output )
{
- rmd160_finish( (rmd160_context *) ctx, output );
+ ripemd160_finish( (ripemd160_context *) ctx, output );
}
-static int rmd160_file_wrap( const char *path, unsigned char *output )
+static int ripemd160_file_wrap( const char *path, unsigned char *output )
{
#if defined(POLARSSL_FS_IO)
- return rmd160_file( path, output );
+ return ripemd160_file( path, output );
#else
((void) path);
((void) output);
@@ -352,58 +352,58 @@
#endif
}
-static void rmd160_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
+static void ripemd160_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen )
{
- rmd160_hmac_starts( (rmd160_context *) ctx, key, keylen );
+ ripemd160_hmac_starts( (ripemd160_context *) ctx, key, keylen );
}
-static void rmd160_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
+static void ripemd160_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen )
{
- rmd160_hmac_update( (rmd160_context *) ctx, input, ilen );
+ ripemd160_hmac_update( (ripemd160_context *) ctx, input, ilen );
}
-static void rmd160_hmac_finish_wrap( void *ctx, unsigned char *output )
+static void ripemd160_hmac_finish_wrap( void *ctx, unsigned char *output )
{
- rmd160_hmac_finish( (rmd160_context *) ctx, output );
+ ripemd160_hmac_finish( (ripemd160_context *) ctx, output );
}
-static void rmd160_hmac_reset_wrap( void *ctx )
+static void ripemd160_hmac_reset_wrap( void *ctx )
{
- rmd160_hmac_reset( (rmd160_context *) ctx );
+ ripemd160_hmac_reset( (ripemd160_context *) ctx );
}
-static void * rmd160_ctx_alloc( void )
+static void * ripemd160_ctx_alloc( void )
{
- return polarssl_malloc( sizeof( rmd160_context ) );
+ return polarssl_malloc( sizeof( ripemd160_context ) );
}
-static void rmd160_ctx_free( void *ctx )
+static void ripemd160_ctx_free( void *ctx )
{
polarssl_free( ctx );
}
-static void rmd160_process_wrap( void *ctx, const unsigned char *data )
+static void ripemd160_process_wrap( void *ctx, const unsigned char *data )
{
- rmd160_process( (rmd160_context *) ctx, data );
+ ripemd160_process( (ripemd160_context *) ctx, data );
}
-const md_info_t rmd160_info = {
- POLARSSL_MD_RMD160,
- "RMD160",
+const md_info_t ripemd160_info = {
+ POLARSSL_MD_RIPEMD160,
+ "RIPEMD160",
20,
- rmd160_starts_wrap,
- rmd160_update_wrap,
- rmd160_finish_wrap,
- rmd160,
- rmd160_file_wrap,
- rmd160_hmac_starts_wrap,
- rmd160_hmac_update_wrap,
- rmd160_hmac_finish_wrap,
- rmd160_hmac_reset_wrap,
- rmd160_hmac,
- rmd160_ctx_alloc,
- rmd160_ctx_free,
- rmd160_process_wrap,
+ ripemd160_starts_wrap,
+ ripemd160_update_wrap,
+ ripemd160_finish_wrap,
+ ripemd160,
+ ripemd160_file_wrap,
+ ripemd160_hmac_starts_wrap,
+ ripemd160_hmac_update_wrap,
+ ripemd160_hmac_finish_wrap,
+ ripemd160_hmac_reset_wrap,
+ ripemd160_hmac,
+ ripemd160_ctx_alloc,
+ ripemd160_ctx_free,
+ ripemd160_process_wrap,
};
#endif
diff --git a/library/rmd160.c b/library/ripemd160.c
similarity index 80%
rename from library/rmd160.c
rename to library/ripemd160.c
index 5dadb3a..569cbde 100644
--- a/library/rmd160.c
+++ b/library/ripemd160.c
@@ -31,9 +31,9 @@
#include "polarssl/config.h"
-#if defined(POLARSSL_RMD160_C)
+#if defined(POLARSSL_RIPEMD160_C)
-#include "polarssl/rmd160.h"
+#include "polarssl/ripemd160.h"
#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
#include <stdio.h>
@@ -67,9 +67,9 @@
#endif
/*
- * RMD160 context setup
+ * RIPEMD-160 context setup
*/
-void rmd160_starts( rmd160_context *ctx )
+void ripemd160_starts( ripemd160_context *ctx )
{
ctx->total[0] = 0;
ctx->total[1] = 0;
@@ -84,7 +84,7 @@
/*
* Process one block
*/
-void rmd160_process( rmd160_context *ctx, const unsigned char data[64] )
+void ripemd160_process( ripemd160_context *ctx, const unsigned char data[64] )
{
uint32_t A, B, C, D, E, Ap, Bp, Cp, Dp, Ep, X[16];
@@ -262,10 +262,10 @@
}
/*
- * RMD160 process buffer
+ * RIPEMD-160 process buffer
*/
-void rmd160_update( rmd160_context *ctx,
- const unsigned char *input, size_t ilen )
+void ripemd160_update( ripemd160_context *ctx,
+ const unsigned char *input, size_t ilen )
{
size_t fill;
uint32_t left;
@@ -285,7 +285,7 @@
if( left && ilen >= fill )
{
memcpy( (void *) (ctx->buffer + left), input, fill );
- rmd160_process( ctx, ctx->buffer );
+ ripemd160_process( ctx, ctx->buffer );
input += fill;
ilen -= fill;
left = 0;
@@ -293,7 +293,7 @@
while( ilen >= 64 )
{
- rmd160_process( ctx, input );
+ ripemd160_process( ctx, input );
input += 64;
ilen -= 64;
}
@@ -304,7 +304,7 @@
}
}
-static const unsigned char rmd160_padding[64] =
+static const unsigned char ripemd160_padding[64] =
{
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -313,9 +313,9 @@
};
/*
- * RMD160 final digest
+ * RIPEMD-160 final digest
*/
-void rmd160_finish( rmd160_context *ctx, unsigned char output[20] )
+void ripemd160_finish( ripemd160_context *ctx, unsigned char output[20] )
{
uint32_t last, padn;
uint32_t high, low;
@@ -331,8 +331,8 @@
last = ctx->total[0] & 0x3F;
padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
- rmd160_update( ctx, rmd160_padding, padn );
- rmd160_update( ctx, msglen, 8 );
+ ripemd160_update( ctx, ripemd160_padding, padn );
+ ripemd160_update( ctx, msglen, 8 );
PUT_UINT32_LE( ctx->state[0], output, 0 );
PUT_UINT32_LE( ctx->state[1], output, 4 );
@@ -342,46 +342,47 @@
}
/*
- * output = RMD160( input buffer )
+ * output = RIPEMD-160( input buffer )
*/
-void rmd160( const unsigned char *input, size_t ilen, unsigned char output[20] )
+void ripemd160( const unsigned char *input, size_t ilen,
+ unsigned char output[20] )
{
- rmd160_context ctx;
+ ripemd160_context ctx;
- rmd160_starts( &ctx );
- rmd160_update( &ctx, input, ilen );
- rmd160_finish( &ctx, output );
+ ripemd160_starts( &ctx );
+ ripemd160_update( &ctx, input, ilen );
+ ripemd160_finish( &ctx, output );
- memset( &ctx, 0, sizeof( rmd160_context ) );
+ memset( &ctx, 0, sizeof( ripemd160_context ) );
}
#if defined(POLARSSL_FS_IO)
/*
- * output = RMD160( file contents )
+ * output = RIPEMD-160( file contents )
*/
-int rmd160_file( const char *path, unsigned char output[20] )
+int ripemd160_file( const char *path, unsigned char output[20] )
{
FILE *f;
size_t n;
- rmd160_context ctx;
+ ripemd160_context ctx;
unsigned char buf[1024];
if( ( f = fopen( path, "rb" ) ) == NULL )
- return( POLARSSL_ERR_RMD160_FILE_IO_ERROR );
+ return( POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR );
- rmd160_starts( &ctx );
+ ripemd160_starts( &ctx );
while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
- rmd160_update( &ctx, buf, n );
+ ripemd160_update( &ctx, buf, n );
- rmd160_finish( &ctx, output );
+ ripemd160_finish( &ctx, output );
- memset( &ctx, 0, sizeof( rmd160_context ) );
+ memset( &ctx, 0, sizeof( ripemd160_context ) );
if( ferror( f ) != 0 )
{
fclose( f );
- return( POLARSSL_ERR_RMD160_FILE_IO_ERROR );
+ return( POLARSSL_ERR_RIPEMD160_FILE_IO_ERROR );
}
fclose( f );
@@ -389,19 +390,18 @@
}
#endif /* POLARSSL_FS_IO */
-
/*
- * RMD160 HMAC context setup
+ * RIPEMD-160 HMAC context setup
*/
-void rmd160_hmac_starts( rmd160_context *ctx,
- const unsigned char *key, size_t keylen )
+void ripemd160_hmac_starts( ripemd160_context *ctx,
+ const unsigned char *key, size_t keylen )
{
size_t i;
unsigned char sum[20];
if( keylen > 64 )
{
- rmd160( key, keylen, sum );
+ ripemd160( key, keylen, sum );
keylen = 20;
key = sum;
}
@@ -415,60 +415,60 @@
ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
}
- rmd160_starts( ctx );
- rmd160_update( ctx, ctx->ipad, 64 );
+ ripemd160_starts( ctx );
+ ripemd160_update( ctx, ctx->ipad, 64 );
memset( sum, 0, sizeof( sum ) );
}
/*
- * RMD160 HMAC process buffer
+ * RIPEMD-160 HMAC process buffer
*/
-void rmd160_hmac_update( rmd160_context *ctx,
- const unsigned char *input, size_t ilen )
+void ripemd160_hmac_update( ripemd160_context *ctx,
+ const unsigned char *input, size_t ilen )
{
- rmd160_update( ctx, input, ilen );
+ ripemd160_update( ctx, input, ilen );
}
/*
- * RMD160 HMAC final digest
+ * RIPEMD-160 HMAC final digest
*/
-void rmd160_hmac_finish( rmd160_context *ctx, unsigned char output[20] )
+void ripemd160_hmac_finish( ripemd160_context *ctx, unsigned char output[20] )
{
unsigned char tmpbuf[20];
- rmd160_finish( ctx, tmpbuf );
- rmd160_starts( ctx );
- rmd160_update( ctx, ctx->opad, 64 );
- rmd160_update( ctx, tmpbuf, 20 );
- rmd160_finish( ctx, output );
+ ripemd160_finish( ctx, tmpbuf );
+ ripemd160_starts( ctx );
+ ripemd160_update( ctx, ctx->opad, 64 );
+ ripemd160_update( ctx, tmpbuf, 20 );
+ ripemd160_finish( ctx, output );
memset( tmpbuf, 0, sizeof( tmpbuf ) );
}
/*
- * RMD160 HMAC context reset
+ * RIPEMD-160 HMAC context reset
*/
-void rmd160_hmac_reset( rmd160_context *ctx )
+void ripemd160_hmac_reset( ripemd160_context *ctx )
{
- rmd160_starts( ctx );
- rmd160_update( ctx, ctx->ipad, 64 );
+ ripemd160_starts( ctx );
+ ripemd160_update( ctx, ctx->ipad, 64 );
}
/*
- * output = HMAC-RMD160( hmac key, input buffer )
+ * output = HMAC-RIPEMD-160( hmac key, input buffer )
*/
-void rmd160_hmac( const unsigned char *key, size_t keylen,
- const unsigned char *input, size_t ilen,
- unsigned char output[20] )
+void ripemd160_hmac( const unsigned char *key, size_t keylen,
+ const unsigned char *input, size_t ilen,
+ unsigned char output[20] )
{
- rmd160_context ctx;
+ ripemd160_context ctx;
- rmd160_hmac_starts( &ctx, key, keylen );
- rmd160_hmac_update( &ctx, input, ilen );
- rmd160_hmac_finish( &ctx, output );
+ ripemd160_hmac_starts( &ctx, key, keylen );
+ ripemd160_hmac_update( &ctx, input, ilen );
+ ripemd160_hmac_finish( &ctx, output );
- memset( &ctx, 0, sizeof( rmd160_context ) );
+ memset( &ctx, 0, sizeof( ripemd160_context ) );
}
@@ -479,7 +479,7 @@
*/
#define TESTS 8
#define KEYS 2
-static const char *rmd160_test_input[TESTS] =
+static const char *ripemd160_test_input[TESTS] =
{
"",
"a",
@@ -492,7 +492,7 @@
"1234567890123456789012345678901234567890",
};
-static const unsigned char rmd160_test_md[TESTS][20] =
+static const unsigned char ripemd160_test_md[TESTS][20] =
{
{ 0x9c, 0x11, 0x85, 0xa5, 0xc5, 0xe9, 0xfc, 0x54, 0x61, 0x28,
0x08, 0x97, 0x7e, 0xe8, 0xf5, 0x48, 0xb2, 0x25, 0x8d, 0x31 },
@@ -512,7 +512,7 @@
0xd3, 0x32, 0x3c, 0xab, 0x82, 0xbf, 0x63, 0x32, 0x6b, 0xfb },
};
-static const unsigned char rmd160_test_hmac[KEYS][TESTS][20] =
+static const unsigned char ripemd160_test_hmac[KEYS][TESTS][20] =
{
{
{ 0xcf, 0x38, 0x76, 0x77, 0xbf, 0xda, 0x84, 0x83, 0xe6, 0x3b,
@@ -552,7 +552,7 @@
},
};
-static const unsigned char rmd160_test_key[KEYS][20] =
+static const unsigned char ripemd160_test_key[KEYS][20] =
{
{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x01, 0x23, 0x45, 0x67 },
@@ -563,7 +563,7 @@
/*
* Checkup routine
*/
-int rmd160_self_test( int verbose )
+int ripemd160_self_test( int verbose )
{
int i, j;
unsigned char output[20];
@@ -573,13 +573,13 @@
for( i = 0; i < TESTS; i++ )
{
if( verbose != 0 )
- printf( " RMD160 test #%d: ", i + 1 );
+ printf( " RIPEMD-160 test #%d: ", i + 1 );
- rmd160( (const unsigned char *) rmd160_test_input[i],
- strlen( rmd160_test_input[i] ),
- output );
+ ripemd160( (const unsigned char *) ripemd160_test_input[i],
+ strlen( ripemd160_test_input[i] ),
+ output );
- if( memcmp( output, rmd160_test_md[i], 20 ) != 0 )
+ if( memcmp( output, ripemd160_test_md[i], 20 ) != 0 )
{
if( verbose != 0 )
printf( "failed\n" );
@@ -593,14 +593,14 @@
for( j = 0; j < KEYS; j++ )
{
if( verbose != 0 )
- printf( " HMAC-RMD160 test #%d, key #%d: ", i + 1, j + 1 );
+ printf( " HMAC-RIPEMD-160 test #%d, key #%d: ", i + 1, j + 1 );
- rmd160_hmac( rmd160_test_key[j], 20,
- (const unsigned char *) rmd160_test_input[i],
- strlen( rmd160_test_input[i] ),
- output );
+ ripemd160_hmac( ripemd160_test_key[j], 20,
+ (const unsigned char *) ripemd160_test_input[i],
+ strlen( ripemd160_test_input[i] ),
+ output );
- if( memcmp( output, rmd160_test_hmac[j][i], 20 ) != 0 )
+ if( memcmp( output, ripemd160_test_hmac[j][i], 20 ) != 0 )
{
if( verbose != 0 )
printf( "failed\n" );