denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Add helper to determine EVP_MD from hash_algorithm_t

Browse Source
This commit is contained in:
Tobias Brunner
2017-11-08 16:48:10 +01:00
parent a994407d50
commit 5ae3f5cea8
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_hasher.c
+15 -7
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2008 Tobias Brunner * Copyright (C) 2008-2017 Tobias Brunner
* Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * 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 * 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 * 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) if (!name)
{ {
return NULL; 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, INIT(this,
.public = { .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) if (!this->hasher)
{ {
/* OpenSSL does not support the requested algo */ /* OpenSSL does not support the requested algo */
src/libstrongswan/plugins/openssl/openssl_hasher.h
+12 -2
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2008 Tobias Brunner * Copyright (C) 2008-2017 Tobias Brunner
* Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License as published by the
@@ -25,6 +25,8 @@ typedef struct openssl_hasher_t openssl_hasher_t;
#include <crypto/hashers/hasher.h> #include <crypto/hashers/hasher.h>
#include <openssl/evp.h>
/** /**
* Implementation of hashers using OpenSSL. * Implementation of hashers using OpenSSL.
*/ */
@@ -36,6 +38,14 @@ struct openssl_hasher_t {
hasher_t hasher; hasher_t hasher;
}; };
/**
* Determine EVP_MD for the given hash algorithm
*
* @param hash hash algorithm
* @return EVP_MD or NULL if not found/supported
*/
const EVP_MD *openssl_get_md(hash_algorithm_t hash);
/** /**
* Constructor to create openssl_hasher_t. * Constructor to create openssl_hasher_t.
* *