diff options
| author | Martin Willi <martin@revosec.ch> | 2013-04-09 11:48:47 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2013-04-10 18:10:30 +0200 |
| commit | cf1696cab9b51cffc0b51ec6d582c059d697183b (patch) | |
| tree | 0e2b0c83e1a818ed936c4323d330e93c6d47bc5f /src/libstrongswan | |
| parent | b52771fbb2d25a947204d95fe29882cfc0312ef5 (diff) | |
| download | strongswan-cf1696cab9b51cffc0b51ec6d582c059d697183b.tar.bz2 strongswan-cf1696cab9b51cffc0b51ec6d582c059d697183b.tar.xz | |
Allow SHA1_Init()/SHA1_Update() to fail if OpenSSL version >= 1.0
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_sha1_prf.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c b/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c index 8c00e6a57..446c93e2b 100644 --- a/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c +++ b/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c @@ -42,7 +42,14 @@ struct private_openssl_sha1_prf_t { METHOD(prf_t, get_bytes, bool, 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); +#endif if (bytes) { @@ -84,7 +91,14 @@ METHOD(prf_t, get_key_size, size_t, METHOD(prf_t, set_key, bool, 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); +#endif if (key.len % 4) { |