diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-09-23 10:12:36 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-11-08 16:48:10 +0100 |
| commit | 5ae3f5cea86fde54d4f52c7da93432992fbc06e3 (patch) | |
| tree | 362d0d869f8736fe24ed1eebae12a4946781eb23 /src/libstrongswan/plugins/openssl/openssl_hasher.c | |
| parent | a994407d507b7bc57348ae208d24d35e32af3236 (diff) | |
| download | strongswan-5ae3f5cea86fde54d4f52c7da93432992fbc06e3.tar.bz2 strongswan-5ae3f5cea86fde54d4f52c7da93432992fbc06e3.tar.xz | |
openssl: Add helper to determine EVP_MD from hash_algorithm_t
Diffstat (limited to 'src/libstrongswan/plugins/openssl/openssl_hasher.c')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_hasher.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_hasher.c b/src/libstrongswan/plugins/openssl/openssl_hasher.c index 96ee230c9..eb6c50508 100644 --- a/src/libstrongswan/plugins/openssl/openssl_hasher.c +++ b/src/libstrongswan/plugins/openssl/openssl_hasher.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2008 Tobias Brunner - * Hochschule fuer Technik Rapperswil + * Copyright (C) 2008-2017 Tobias Brunner + * HSR Hochschule fuer Technik Rapperswil * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -91,16 +91,24 @@ METHOD(hasher_t, destroy, void, /* * Described in header */ -openssl_hasher_t *openssl_hasher_create(hash_algorithm_t algo) +const EVP_MD *openssl_get_md(hash_algorithm_t hash) { - private_openssl_hasher_t *this; - char* name; + char *name; - name = enum_to_name(hash_algorithm_short_names, algo); + name = enum_to_name(hash_algorithm_short_names, hash); if (!name) { return NULL; } + return EVP_get_digestbyname(name); +} + +/* + * Described in header + */ +openssl_hasher_t *openssl_hasher_create(hash_algorithm_t algo) +{ + private_openssl_hasher_t *this; INIT(this, .public = { @@ -114,7 +122,7 @@ openssl_hasher_t *openssl_hasher_create(hash_algorithm_t algo) }, ); - this->hasher = EVP_get_digestbyname(name); + this->hasher = openssl_get_md(algo); if (!this->hasher) { /* OpenSSL does not support the requested algo */ |