generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update copyright year.

Browse Source 
Zero ciphertext and plaintext temporary buffers.

Check FIPS_cipher() return value.
This commit is contained in:
Dr. Stephen Henson 2011-04-11 21:32:51 +00:00
parent 4fd7256b77
commit 63c82f8abb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fips/fips.c
View File

@ -1,5 +1,5 @@
/* ==================================================================== /* ====================================================================
* Copyright (c) 2003 The OpenSSL Project. All rights reserved. * Copyright (c) 2011 The OpenSSL Project. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -70,8 +70,8 @@
#define PATH_MAX 1024 #define PATH_MAX 1024
#endif #endif
static int fips_selftest_fail; static int fips_selftest_fail = 0;
static int fips_mode; static int fips_mode = 0;
static int fips_started = 0; static int fips_started = 0;
static int fips_is_owning_thread(void); static int fips_is_owning_thread(void);
@ -511,9 +511,12 @@ int fips_cipher_test(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
unsigned char pltmp[FIPS_MAX_CIPHER_TEST_SIZE]; unsigned char pltmp[FIPS_MAX_CIPHER_TEST_SIZE];
unsigned char citmp[FIPS_MAX_CIPHER_TEST_SIZE]; unsigned char citmp[FIPS_MAX_CIPHER_TEST_SIZE];
OPENSSL_assert(len <= FIPS_MAX_CIPHER_TEST_SIZE); OPENSSL_assert(len <= FIPS_MAX_CIPHER_TEST_SIZE);
memset(pltmp, 0, FIPS_MAX_CIPHER_TEST_SIZE);
memset(citmp, 0, FIPS_MAX_CIPHER_TEST_SIZE);
if (FIPS_cipherinit(ctx, cipher, key, iv, 1) <= 0) if (FIPS_cipherinit(ctx, cipher, key, iv, 1) <= 0)
return 0; return 0;
FIPS_cipher(ctx, citmp, plaintext, len); if (!FIPS_cipher(ctx, citmp, plaintext, len))
return 0;
if (memcmp(citmp, ciphertext, len)) if (memcmp(citmp, ciphertext, len))
return 0; return 0;
if (FIPS_cipherinit(ctx, cipher, key, iv, 0) <= 0) if (FIPS_cipherinit(ctx, cipher, key, iv, 0) <= 0)