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

Moved mgf1 class to libstrongswan/crypto/mgf1

Browse Source
This commit is contained in:
Andreas Steffen
2014-11-29 14:51:15 +01:00
parent 73a327404d
commit 1d3e080877
7 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/Makefile.am
+2 -2
View File
@@ -11,7 +11,7 @@ crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
crypto/rngs/rng.c crypto/prf_plus.c crypto/signers/signer.c \ crypto/rngs/rng.c crypto/prf_plus.c crypto/signers/signer.c \
crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \ crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \ crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \
crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \ crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c crypto/mgf1/mgf1.c \
credentials/credential_factory.c credentials/builder.c \ credentials/credential_factory.c credentials/builder.c \
credentials/cred_encoding.c credentials/keys/private_key.c \ credentials/cred_encoding.c credentials/keys/private_key.c \
credentials/keys/public_key.c credentials/keys/shared_key.c \ credentials/keys/public_key.c credentials/keys/shared_key.c \
@@ -66,7 +66,7 @@ crypto/prfs/prf.h crypto/prfs/mac_prf.h crypto/rngs/rng.h crypto/nonce_gen.h \
crypto/prf_plus.h crypto/signers/signer.h crypto/signers/mac_signer.h \ crypto/prf_plus.h crypto/signers/signer.h crypto/signers/mac_signer.h \
crypto/crypto_factory.h crypto/crypto_tester.h crypto/diffie_hellman.h \ crypto/crypto_factory.h crypto/crypto_tester.h crypto/diffie_hellman.h \
crypto/aead.h crypto/transform.h crypto/pkcs5.h crypto/iv/iv_gen.h \ crypto/aead.h crypto/transform.h crypto/pkcs5.h crypto/iv/iv_gen.h \
crypto/iv/iv_gen_rand.h crypto/iv/iv_gen_seq.h \ crypto/iv/iv_gen_rand.h crypto/iv/iv_gen_seq.h crypto/mgf1/mgf1.h \
credentials/credential_factory.h credentials/builder.h \ credentials/credential_factory.h credentials/builder.h \
credentials/cred_encoding.h credentials/keys/private_key.h \ credentials/cred_encoding.h credentials/keys/private_key.h \
credentials/keys/public_key.h credentials/keys/shared_key.h \ credentials/keys/public_key.h credentials/keys/shared_key.h \
src/libstrongswan/plugins/ntru/ntru_mgf1.c → src/libstrongswan/crypto/mgf1/mgf1.c
+20 -22
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2013 Andreas Steffen * Copyright (C) 2013-2014 Andreas Steffen
* HSR 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
@@ -13,23 +13,23 @@
* for more details. * for more details.
*/ */
#include "ntru_mgf1.h" #include "mgf1.h"
#include <crypto/hashers/hasher.h> #include "crypto/hashers/hasher.h"
#include <utils/debug.h> #include "utils/debug.h"
#include <utils/test.h> #include "utils/test.h"
typedef struct private_ntru_mgf1_t private_ntru_mgf1_t; typedef struct private_mgf1_t private_mgf1_t;
/** /**
* Private data of an ntru_mgf1_t object. * Private data of an mgf1_t object.
*/ */
struct private_ntru_mgf1_t { struct private_mgf1_t {
/** /**
* Public ntru_mgf1_t interface. * Public mgf1_t interface.
*/ */
ntru_mgf1_t public; mgf1_t public;
/** /**
* Hasher the MGF1 Mask Generation Function is based on * Hasher the MGF1 Mask Generation Function is based on
@@ -58,14 +58,14 @@ struct private_ntru_mgf1_t {
}; };
METHOD(ntru_mgf1_t, get_hash_size, size_t, METHOD(mgf1_t, get_hash_size, size_t,
private_ntru_mgf1_t *this) private_mgf1_t *this)
{ {
return this->hasher->get_hash_size(this->hasher); return this->hasher->get_hash_size(this->hasher);
} }
METHOD(ntru_mgf1_t, get_mask, bool, METHOD(mgf1_t, get_mask, bool,
private_ntru_mgf1_t *this, size_t mask_len, u_char *mask) private_mgf1_t *this, size_t mask_len, u_char *mask)
{ {
u_char buf[HASH_SIZE_SHA512]; u_char buf[HASH_SIZE_SHA512];
size_t hash_len; size_t hash_len;
@@ -102,8 +102,8 @@ METHOD(ntru_mgf1_t, get_mask, bool,
return TRUE; return TRUE;
} }
METHOD(ntru_mgf1_t, allocate_mask, bool, METHOD(mgf1_t, allocate_mask, bool,
private_ntru_mgf1_t *this, size_t mask_len, chunk_t *mask) private_mgf1_t *this, size_t mask_len, chunk_t *mask)
{ {
if (mask_len == 0) if (mask_len == 0)
{ {
@@ -115,8 +115,8 @@ METHOD(ntru_mgf1_t, allocate_mask, bool,
return get_mask(this, mask_len, mask->ptr); return get_mask(this, mask_len, mask->ptr);
} }
METHOD(ntru_mgf1_t, destroy, void, METHOD(mgf1_t, destroy, void,
private_ntru_mgf1_t *this) private_mgf1_t *this)
{ {
this->hasher->destroy(this->hasher); this->hasher->destroy(this->hasher);
chunk_clear(&this->state); chunk_clear(&this->state);
@@ -126,10 +126,10 @@ METHOD(ntru_mgf1_t, destroy, void,
/* /*
* Described in header. * Described in header.
*/ */
ntru_mgf1_t *ntru_mgf1_create(hash_algorithm_t alg, chunk_t seed, mgf1_t *mgf1_create(hash_algorithm_t alg, chunk_t seed,
bool hash_seed) bool hash_seed)
{ {
private_ntru_mgf1_t *this; private_mgf1_t *this;
hasher_t *hasher; hasher_t *hasher;
size_t state_len; size_t state_len;
@@ -178,5 +178,3 @@ ntru_mgf1_t *ntru_mgf1_create(hash_algorithm_t alg, chunk_t seed,
return &this->public; return &this->public;
} }
EXPORT_FUNCTION_FOR_TESTS(ntru, ntru_mgf1_create);
src/libstrongswan/plugins/ntru/ntru_mgf1.h → src/libstrongswan/crypto/mgf1/mgf1.h
+12 -12
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2013 Andreas Steffen * Copyright (C) 2013-2014 Andreas Steffen
* HSR 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
@@ -14,14 +14,14 @@
*/ */
/** /**
* @defgroup ntru_mgf1 ntru_mgf1 * @defgroup mgf1 mgf1
* @{ @ingroup ntru_p * @{ @ingroup ntru_p
*/ */
#ifndef NTRU_MGF1_H_ #ifndef MGF1_H_
#define NTRU_MGF1_H_ #define MGF1_H_
typedef struct ntru_mgf1_t ntru_mgf1_t; typedef struct mgf1_t mgf1_t;
#include <library.h> #include <library.h>
@@ -29,14 +29,14 @@ typedef struct ntru_mgf1_t ntru_mgf1_t;
* Implements the PKCS#1 MGF1 Mask Generation Function based on a hash function * Implements the PKCS#1 MGF1 Mask Generation Function based on a hash function
* defined in section 10.2.1 of RFC 2437 * defined in section 10.2.1 of RFC 2437
*/ */
struct ntru_mgf1_t { struct mgf1_t {
/** /**
* Get the hash size of the underlying hash function * Get the hash size of the underlying hash function
* *
* @return hash size in bytes * @return hash size in bytes
*/ */
size_t (*get_hash_size)(ntru_mgf1_t *this); size_t (*get_hash_size)(mgf1_t *this);
/** /**
* Generate a mask pattern and copy it to an output buffer * Generate a mask pattern and copy it to an output buffer
@@ -46,7 +46,7 @@ struct ntru_mgf1_t {
* @param mask output buffer of minimum size mask_len * @param mask output buffer of minimum size mask_len
* @return TRUE if successful * @return TRUE if successful
*/ */
bool (*get_mask)(ntru_mgf1_t *this, size_t mask_len, u_char *mask); bool (*get_mask)(mgf1_t *this, size_t mask_len, u_char *mask);
/** /**
* Generate a mask pattern and return it in an allocated chunk * Generate a mask pattern and return it in an allocated chunk
@@ -55,12 +55,12 @@ struct ntru_mgf1_t {
* @param mask chunk containing generated mask * @param mask chunk containing generated mask
* @return TRUE if successful * @return TRUE if successful
*/ */
bool (*allocate_mask)(ntru_mgf1_t *this, size_t mask_len, chunk_t *mask); bool (*allocate_mask)(mgf1_t *this, size_t mask_len, chunk_t *mask);
/** /**
* Destroy the MGF1 object * Destroy the MGF1 object
*/ */
void (*destroy)(ntru_mgf1_t *this); void (*destroy)(mgf1_t *this);
}; };
/** /**
@@ -70,8 +70,8 @@ struct ntru_mgf1_t {
* @param seed seed used by MGF1 to generate mask from * @param seed seed used by MGF1 to generate mask from
* @param hash_seed hash seed before using it as a seed from MGF1 * @param hash_seed hash seed before using it as a seed from MGF1
*/ */
ntru_mgf1_t *ntru_mgf1_create(hash_algorithm_t alg, chunk_t seed, mgf1_t *mgf1_create(hash_algorithm_t alg, chunk_t seed,
bool hash_seed); bool hash_seed);
#endif /** NTRU_MGF1_H_ @}*/ #endif /** MGF1_H_ @}*/
src/libstrongswan/plugins/ntru/Makefile.am
-1
View File
@@ -16,7 +16,6 @@ libstrongswan_ntru_la_SOURCES = \
ntru_convert.h ntru_convert.c \ ntru_convert.h ntru_convert.c \
ntru_drbg.h ntru_drbg.c \ ntru_drbg.h ntru_drbg.c \
ntru_ke.h ntru_ke.c \ ntru_ke.h ntru_ke.c \
ntru_mgf1.h ntru_mgf1.c \
ntru_param_set.h ntru_param_set.c \ ntru_param_set.h ntru_param_set.c \
ntru_poly.h ntru_poly.c \ ntru_poly.h ntru_poly.c \
ntru_public_key.h ntru_public_key.c \ ntru_public_key.h ntru_public_key.c \
src/libstrongswan/plugins/ntru/ntru_poly.c
+3 -3
View File
@@ -16,8 +16,8 @@
*/ */
#include "ntru_poly.h" #include "ntru_poly.h"
#include "ntru_mgf1.h"
#include <crypto/mgf1/mgf1.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <utils/test.h> #include <utils/test.h>
@@ -301,10 +301,10 @@ ntru_poly_t *ntru_poly_create_from_seed(hash_algorithm_t alg, chunk_t seed,
uint8_t octets[HASH_SIZE_SHA512], *used, num_left = 0, num_needed; uint8_t octets[HASH_SIZE_SHA512], *used, num_left = 0, num_needed;
uint16_t index, limit, left = 0; uint16_t index, limit, left = 0;
int n, num_indices, index_i = 0; int n, num_indices, index_i = 0;
ntru_mgf1_t *mgf1; mgf1_t *mgf1;
DBG2(DBG_LIB, "MGF1 is seeded with %u bytes", seed.len); DBG2(DBG_LIB, "MGF1 is seeded with %u bytes", seed.len);
mgf1 = ntru_mgf1_create(alg, seed, TRUE); mgf1 = mgf1_create(alg, seed, TRUE);
if (!mgf1) if (!mgf1)
{ {
return NULL; return NULL;
src/libstrongswan/plugins/ntru/ntru_trits.c
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2013 Andreas Steffen * Copyright (C) 2013-2014 Andreas Steffen
* HSR 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
@@ -14,9 +14,9 @@
*/ */
#include "ntru_trits.h" #include "ntru_trits.h"
#include "ntru_mgf1.h"
#include "ntru_convert.h" #include "ntru_convert.h"
#include <crypto/mgf1/mgf1.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <utils/test.h> #include <utils/test.h>
@@ -72,10 +72,10 @@ ntru_trits_t *ntru_trits_create(size_t len, hash_algorithm_t alg, chunk_t seed)
private_ntru_trits_t *this; private_ntru_trits_t *this;
uint8_t octets[HASH_SIZE_SHA512], buf[5], *trits; uint8_t octets[HASH_SIZE_SHA512], buf[5], *trits;
size_t hash_len, octet_count = 0, trits_needed, i; size_t hash_len, octet_count = 0, trits_needed, i;
ntru_mgf1_t *mgf1; mgf1_t *mgf1;
DBG2(DBG_LIB, "MGF1 is seeded with %u bytes", seed.len); DBG2(DBG_LIB, "MGF1 is seeded with %u bytes", seed.len);
mgf1 = ntru_mgf1_create(alg, seed, TRUE); mgf1 = mgf1_create(alg, seed, TRUE);
if (!mgf1) if (!mgf1)
{ {
return NULL; return NULL;
src/libstrongswan/tests/suites/test_ntru.c
+10 -18
View File
@@ -16,20 +16,17 @@
#include "test_suite.h" #include "test_suite.h"
#include <tests/utils/test_rng.h> #include <tests/utils/test_rng.h>
#include <utils/test.h>
#include <crypto/mgf1/mgf1.h>
#include <plugins/ntru/ntru_drbg.h> #include <plugins/ntru/ntru_drbg.h>
#include <plugins/ntru/ntru_mgf1.h>
#include <plugins/ntru/ntru_trits.h> #include <plugins/ntru/ntru_trits.h>
#include <plugins/ntru/ntru_poly.h> #include <plugins/ntru/ntru_poly.h>
#include <plugins/ntru/ntru_param_set.h> #include <plugins/ntru/ntru_param_set.h>
#include <plugins/ntru/ntru_private_key.h> #include <plugins/ntru/ntru_private_key.h>
#include <utils/test.h>
IMPORT_FUNCTION_FOR_TESTS(ntru, ntru_drbg_create, ntru_drbg_t*, IMPORT_FUNCTION_FOR_TESTS(ntru, ntru_drbg_create, ntru_drbg_t*,
u_int32_t strength, chunk_t pers_str, rng_t *entropy) u_int32_t strength, chunk_t pers_str, rng_t *entropy)
IMPORT_FUNCTION_FOR_TESTS(ntru, ntru_mgf1_create, ntru_mgf1_t*,
hash_algorithm_t alg, chunk_t seed, bool hash_seed)
IMPORT_FUNCTION_FOR_TESTS(ntru, ntru_trits_create, ntru_trits_t*, IMPORT_FUNCTION_FOR_TESTS(ntru, ntru_trits_create, ntru_trits_t*,
size_t len, hash_algorithm_t alg, chunk_t seed) size_t len, hash_algorithm_t alg, chunk_t seed)
@@ -546,9 +543,9 @@ mgf1_test_t mgf1_tests[] = {
} }
}; };
START_TEST(test_ntru_mgf1) START_TEST(ntru_test_mgf1)
{ {
ntru_mgf1_t *mgf1; mgf1_t *mgf1;
chunk_t mask, mask1, mask2, mask3; chunk_t mask, mask1, mask2, mask3;
mask1 = mgf1_tests[_i].mask; mask1 = mgf1_tests[_i].mask;
@@ -558,17 +555,14 @@ START_TEST(test_ntru_mgf1)
mask2.len = mgf1_tests[_i].ml2; mask2.len = mgf1_tests[_i].ml2;
mask3.len = mgf1_tests[_i].ml3; mask3.len = mgf1_tests[_i].ml3;
mgf1 = TEST_FUNCTION(ntru, ntru_mgf1_create, HASH_UNKNOWN, mgf1 = mgf1_create(HASH_UNKNOWN, mgf1_tests[_i].seed, TRUE);
mgf1_tests[_i].seed, TRUE);
ck_assert(mgf1 == NULL); ck_assert(mgf1 == NULL);
mgf1 = TEST_FUNCTION(ntru, ntru_mgf1_create, mgf1_tests[_i].alg, mgf1 = mgf1_create(mgf1_tests[_i].alg, chunk_empty, TRUE);
chunk_empty, TRUE);
ck_assert(mgf1 == NULL); ck_assert(mgf1 == NULL);
/* return mask in allocated chunk */ /* return mask in allocated chunk */
mgf1 = TEST_FUNCTION(ntru, ntru_mgf1_create, mgf1_tests[_i].alg, mgf1 = mgf1_create(mgf1_tests[_i].alg, mgf1_tests[_i].seed, TRUE);
mgf1_tests[_i].seed, TRUE);
ck_assert(mgf1); ck_assert(mgf1);
/* check hash size */ /* check hash size */
@@ -584,16 +578,14 @@ START_TEST(test_ntru_mgf1)
mgf1->destroy(mgf1); mgf1->destroy(mgf1);
/* copy mask to pre-allocated buffer */ /* copy mask to pre-allocated buffer */
mgf1 = TEST_FUNCTION(ntru, ntru_mgf1_create, mgf1_tests[_i].alg, mgf1 = mgf1_create(mgf1_tests[_i].alg, mgf1_tests[_i].seed, TRUE);
mgf1_tests[_i].seed, TRUE);
ck_assert(mgf1); ck_assert(mgf1);
ck_assert(mgf1->get_mask(mgf1, mgf1_tests[_i].mask.len, mask.ptr)); ck_assert(mgf1->get_mask(mgf1, mgf1_tests[_i].mask.len, mask.ptr));
ck_assert(chunk_equals(mask, mgf1_tests[_i].mask)); ck_assert(chunk_equals(mask, mgf1_tests[_i].mask));
mgf1->destroy(mgf1); mgf1->destroy(mgf1);
/* get mask in batches without hashing the seed */ /* get mask in batches without hashing the seed */
mgf1 = TEST_FUNCTION(ntru, ntru_mgf1_create, mgf1_tests[_i].alg, mgf1 = mgf1_create(mgf1_tests[_i].alg, mgf1_tests[_i].hashed_seed, FALSE);
mgf1_tests[_i].hashed_seed, FALSE);
ck_assert(mgf1); ck_assert(mgf1);
/* first batch */ /* first batch */
@@ -1371,7 +1363,7 @@ Suite *ntru_suite_create()
suite_add_tcase(s, tc); suite_add_tcase(s, tc);
tc = tcase_create("mgf1"); tc = tcase_create("mgf1");
tcase_add_loop_test(tc, test_ntru_mgf1, 0, countof(mgf1_tests)); tcase_add_loop_test(tc, ntru_test_mgf1, 0, countof(mgf1_tests));
suite_add_tcase(s, tc); suite_add_tcase(s, tc);
tc = tcase_create("trits"); tc = tcase_create("trits");