izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update test for elimination of ae_allocate() / ae_free().

Browse Source
This commit is contained in:
Keith Winstein
2012-04-22 22:50:09 -04:00
parent e8236c5fd4
commit e7d2bcf642
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/ocb-aes.cc
+18 -14
View File
@@ -46,22 +46,23 @@ bool equal( const AlignedBuffer &a, const AlignedBuffer &b ) {
&& !memcmp( a.data(), b.data(), a.len() ); && !memcmp( a.data(), b.data(), a.len() );
} }
ae_ctx *get_ctx( const AlignedBuffer &key ) { AlignedBuffer *get_ctx( const AlignedBuffer &key ) {
ae_ctx *ctx = ae_allocate( NULL ); AlignedBuffer *ctx_buf = new AlignedBuffer( ae_ctx_sizeof() );
fatal_assert( ctx ); fatal_assert( ctx_buf );
fatal_assert( AE_SUCCESS == ae_init( ctx, key.data(), key.len(), NONCE_LEN, TAG_LEN ) ); fatal_assert( AE_SUCCESS == ae_init( (ae_ctx *)ctx_buf->data(), key.data(), key.len(), NONCE_LEN, TAG_LEN ) );
return ctx; return ctx_buf;
} }
void scrap_ctx( ae_ctx *ctx ) { void scrap_ctx( AlignedBuffer *ctx_buf ) {
fatal_assert( AE_SUCCESS == ae_clear( ctx ) ); fatal_assert( AE_SUCCESS == ae_clear( (ae_ctx *)ctx_buf->data() ) );
ae_free( ctx ); delete ctx_buf;
} }
void test_encrypt( const AlignedBuffer &key, const AlignedBuffer &nonce, void test_encrypt( const AlignedBuffer &key, const AlignedBuffer &nonce,
const AlignedBuffer &plaintext, const AlignedBuffer &assoc, const AlignedBuffer &plaintext, const AlignedBuffer &assoc,
const AlignedBuffer &expected_ciphertext ) { const AlignedBuffer &expected_ciphertext ) {
ae_ctx *ctx = get_ctx( key ); AlignedBuffer *ctx_buf = get_ctx( key );
ae_ctx *ctx = (ae_ctx *)ctx_buf->data();
AlignedBuffer observed_ciphertext( plaintext.len() + TAG_LEN ); AlignedBuffer observed_ciphertext( plaintext.len() + TAG_LEN );
@@ -79,14 +80,15 @@ void test_encrypt( const AlignedBuffer &key, const AlignedBuffer &nonce,
fatal_assert( ret == int( expected_ciphertext.len() ) ); fatal_assert( ret == int( expected_ciphertext.len() ) );
fatal_assert( equal( expected_ciphertext, observed_ciphertext ) ); fatal_assert( equal( expected_ciphertext, observed_ciphertext ) );
scrap_ctx( ctx ); scrap_ctx( ctx_buf );
} }
void test_decrypt( const AlignedBuffer &key, const AlignedBuffer &nonce, void test_decrypt( const AlignedBuffer &key, const AlignedBuffer &nonce,
const AlignedBuffer &ciphertext, const AlignedBuffer &assoc, const AlignedBuffer &ciphertext, const AlignedBuffer &assoc,
const AlignedBuffer &expected_plaintext, const AlignedBuffer &expected_plaintext,
bool valid ) { bool valid ) {
ae_ctx *ctx = get_ctx( key ); AlignedBuffer *ctx_buf = get_ctx( key );
ae_ctx *ctx = (ae_ctx *)ctx_buf->data();
AlignedBuffer observed_plaintext( ciphertext.len() - TAG_LEN ); AlignedBuffer observed_plaintext( ciphertext.len() - TAG_LEN );
@@ -110,7 +112,7 @@ void test_decrypt( const AlignedBuffer &key, const AlignedBuffer &nonce,
fatal_assert( ret == AE_INVALID ); fatal_assert( ret == AE_INVALID );
} }
scrap_ctx( ctx ); scrap_ctx( ctx_buf );
} }
void test_vector( const char *key_p, const char *nonce_p, void test_vector( const char *key_p, const char *nonce_p,
@@ -451,7 +453,9 @@ void test_iterative( void ) {
/* Key is always all zeros */ /* Key is always all zeros */
AlignedBuffer key( KEY_LEN ); AlignedBuffer key( KEY_LEN );
memset( key.data(), 0, KEY_LEN ); memset( key.data(), 0, KEY_LEN );
ae_ctx *ctx = get_ctx( key );
AlignedBuffer *ctx_buf = get_ctx( key );
ae_ctx *ctx = (ae_ctx *)ctx_buf->data();
AlignedBuffer nonce( NONCE_LEN ); AlignedBuffer nonce( NONCE_LEN );
memset( nonce.data(), 0, NONCE_LEN ); memset( nonce.data(), 0, NONCE_LEN );
@@ -513,7 +517,7 @@ void test_iterative( void ) {
AlignedBuffer correct( TAG_LEN, "\xB2\xB4\x1C\xBF\x9B\x05\x03\x7D\xA7\xF1\x6C\x24\xA3\x5C\x1C\x94" ); AlignedBuffer correct( TAG_LEN, "\xB2\xB4\x1C\xBF\x9B\x05\x03\x7D\xA7\xF1\x6C\x24\xA3\x5C\x1C\x94" );
fatal_assert( equal( out, correct ) ); fatal_assert( equal( out, correct ) );
scrap_ctx( ctx ); scrap_ctx( ctx_buf );
if ( verbose ) { if ( verbose ) {
printf( "iterative PASSED\n\n" ); printf( "iterative PASSED\n\n" );