sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-23 00:00:18 -04:00
Code Issues Projects Releases Wiki Activity

Allow SHA1_Init()/SHA1_Update() to fail if OpenSSL version >= 1.0

Browse Source
This commit is contained in:
Martin Willi 2013-04-09 11:48:47 +02:00 committed by Andreas Steffen
parent b52771fbb2
commit cf1696cab9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libstrongswan/plugins/openssl/openssl_sha1_prf.c
View File

@ -42,7 +42,14 @@ struct private_openssl_sha1_prf_t {
METHOD(prf_t, get_bytes, bool, METHOD(prf_t, get_bytes, bool,
private_openssl_sha1_prf_t *this, chunk_t seed, u_int8_t *bytes) private_openssl_sha1_prf_t *this, chunk_t seed, u_int8_t *bytes)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
if (!SHA1_Update(&this->ctx, seed.ptr, seed.len))
{
return FALSE;
}
#else /* OPENSSL_VERSION_NUMBER < 1.0 */
SHA1_Update(&this->ctx, seed.ptr, seed.len); SHA1_Update(&this->ctx, seed.ptr, seed.len);
#endif
if (bytes) if (bytes)
{ {
@ -84,7 +91,14 @@ METHOD(prf_t, get_key_size, size_t,
METHOD(prf_t, set_key, bool, METHOD(prf_t, set_key, bool,
private_openssl_sha1_prf_t *this, chunk_t key) private_openssl_sha1_prf_t *this, chunk_t key)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
if (!SHA1_Init(&this->ctx))
{
return FALSE;
}
#else /* OPENSSL_VERSION_NUMBER < 1.0 */
SHA1_Init(&this->ctx); SHA1_Init(&this->ctx);
#endif
if (key.len % 4) if (key.len % 4)
{ {