diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-07-09 21:02:41 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-07-09 21:02:41 +0000 |
| commit | db67c87db3c9089ea8d2e14f617bf3d9e2af261f (patch) | |
| tree | 665c0caea83d34c11c1517c4c57137bb58cba6fb /src/libstrongswan/fips/fips.c | |
| parent | 1c088a8b6237ec67f63c23f97a0f2dc4e99af869 (diff) | |
| download | vyos-strongswan-db67c87db3c9089ea8d2e14f617bf3d9e2af261f.tar.gz vyos-strongswan-db67c87db3c9089ea8d2e14f617bf3d9e2af261f.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.2.4)
Diffstat (limited to 'src/libstrongswan/fips/fips.c')
| -rw-r--r-- | src/libstrongswan/fips/fips.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libstrongswan/fips/fips.c b/src/libstrongswan/fips/fips.c index aba292d81..c268a7429 100644 --- a/src/libstrongswan/fips/fips.c +++ b/src/libstrongswan/fips/fips.c @@ -1,10 +1,3 @@ -/** - * @file fips.c - * - * @brief Implementation of the libstrongswan integrity test. - * - */ - /* * Copyright (C) 2007 Bruno Krieg, Daniel Wydler * Hochschule fuer Technik Rapperswil @@ -18,12 +11,14 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. + * + * $Id: fips.c 3681 2008-03-28 10:21:04Z martin $ */ #include <stdio.h> #include <debug.h> -#include <crypto/signers/hmac_signer.h> +#include <crypto/signers/signer.h> #include "fips.h" extern const u_char FIPS_rodata_start[]; @@ -61,7 +56,7 @@ bool fips_compute_hmac_signature(const char *key, char *signature) DBG1(" RODATA: %p + %6d = %p", FIPS_rodata_start, (int)rodata_len, FIPS_rodata_end); - signer = (signer_t *)hmac_signer_create(HASH_SHA1, HASH_SIZE_SHA1); + signer = lib->crypto->create_signer(lib->crypto, AUTH_HMAC_SHA1_128); if (signer == NULL) { DBG1(" SHA-1 HMAC signer could not be created"); @@ -69,7 +64,7 @@ bool fips_compute_hmac_signature(const char *key, char *signature) } else { - chunk_t hmac_key = { key, strlen(key) }; + chunk_t hmac_key = { (u_char *)key, strlen(key) }; chunk_t text_chunk = { text_start, text_len }; chunk_t rodata_chunk = { (u_char *)FIPS_rodata_start, rodata_len }; chunk_t signature_chunk = chunk_empty; |