mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-30 07:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use mbedtls_xor in PKCS #5

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2022-11-22 16:56:59 +00:00
parent 99a507ee55
commit 74b345f282
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/pkcs5.c
View File

@ -211,7 +211,6 @@ static int pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx,
uint32_t key_length, unsigned char *output ) uint32_t key_length, unsigned char *output )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
int j;
unsigned int i; unsigned int i;
unsigned char md1[MBEDTLS_MD_MAX_SIZE]; unsigned char md1[MBEDTLS_MD_MAX_SIZE];
unsigned char work[MBEDTLS_MD_MAX_SIZE]; unsigned char work[MBEDTLS_MD_MAX_SIZE];
@ -263,8 +262,7 @@ static int pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx,
// U1 xor U2 // U1 xor U2
// //
for( j = 0; j < md_size; j++ ) mbedtls_xor( work, work, md1, md_size );
work[j] ^= md1[j];
} }
use_len = ( key_length < md_size ) ? key_length : md_size; use_len = ( key_length < md_size ) ? key_length : md_size;
@ -396,8 +394,7 @@ exit:
// U1 xor U2 // U1 xor U2
// //
for( j = 0; j < md_size; j++ ) mbedtls_xor( work, work, md1, md_size );
work[j] ^= md1[j];
} }
use_len = ( key_length < md_size ) ? key_length : md_size; use_len = ( key_length < md_size ) ? key_length : md_size;