diff options
| -rw-r--r-- | src/charon/config/proposal.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/hashers/sha2_hasher.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c index 498a5114c..393f0f3aa 100644 --- a/src/charon/config/proposal.c +++ b/src/charon/config/proposal.c @@ -117,7 +117,7 @@ struct private_proposal_t { /** * Add algorithm/keysize to a algorithm list */ -static void add_algo(linked_list_t *list, u_int8_t algo, size_t key_size) +static void add_algo(linked_list_t *list, u_int16_t algo, size_t key_size) { algorithm_t *algo_key; diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 799fb3ac1..6fddda20a 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -19,6 +19,7 @@ crypto/crypters/aes_cbc_crypter.c crypto/crypters/aes_cbc_crypter.h\ crypto/crypters/des_crypter.c crypto/crypters/des_crypter.h\ crypto/hashers/hasher.h crypto/hashers/hasher.c \ crypto/hashers/sha1_hasher.c crypto/hashers/sha1_hasher.h \ +crypto/hashers/sha2_hasher.c crypto/hashers/sha2_hasher.h \ crypto/hashers/md5_hasher.c crypto/hashers/md5_hasher.h \ crypto/prf_plus.h crypto/prf_plus.c \ crypto/hmac.c crypto/hmac.h \ diff --git a/src/libstrongswan/crypto/hashers/sha2_hasher.c b/src/libstrongswan/crypto/hashers/sha2_hasher.c index b23357c1b..5378dbc9a 100644 --- a/src/libstrongswan/crypto/hashers/sha2_hasher.c +++ b/src/libstrongswan/crypto/hashers/sha2_hasher.c @@ -8,9 +8,9 @@ /* * Copyright (C) 2006 Martin Willi * Hochschule fuer Technik Rapperswil - * - * Ported from Steve Reid's <steve@edmweb.com> implementation - * "SHA1 in C" found in strongSwan. + * Copyright (C) 2001 Jari Ruusu. + * + * Ported from strongSwans implementation written by Jari Ruusu. * * 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 |