Commit Graph
317 Commits
Author SHA1 Message Date
Martin Willi b24be29646 Merge branch 'ikev1'
Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/encoding/generator.c
	src/libcharon/encoding/payloads/notify_payload.c
	src/libcharon/encoding/payloads/notify_payload.h
	src/libcharon/encoding/payloads/payload.c
	src/libcharon/network/receiver.c
	src/libcharon/sa/authenticator.c
	src/libcharon/sa/authenticator.h
	src/libcharon/sa/ikev2/tasks/ike_init.c
	src/libcharon/sa/task_manager.c
	src/libstrongswan/credentials/auth_cfg.c
2012-05-02 11:12:31 +02:00
Tobias Brunner bad192069f Make AES-CMAC actually usable for IKEv2. 2012-04-04 10:51:46 +02:00
Andreas Steffen d1391b8fdb fixed typo 2012-04-03 12:07:13 +02:00
Martin Willi b1f2f05c92 Merge branch 'ikev1-clean' into ikev1-master
Conflicts:
	configure.in
	man/ipsec.conf.5.in
	src/libcharon/daemon.c
	src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
	src/libcharon/plugins/eap_radius/eap_radius_accounting.c
	src/libcharon/plugins/eap_radius/eap_radius_forward.c
	src/libcharon/plugins/farp/farp_listener.c
	src/libcharon/sa/ike_sa.c
	src/libcharon/sa/keymat.c
	src/libcharon/sa/task_manager.c
	src/libcharon/sa/trap_manager.c
	src/libstrongswan/plugins/x509/x509_cert.c
	src/libstrongswan/utils.h

Applied lost changes of moved files keymat.c and task_manager.c.
Updated listener_t.message hook signature in new plugins.
2012-03-20 17:57:53 +01:00
Martin Willi 7b1e15ac4e Fixed IKEv1 prf+ keymat expansion beyond 320 bits 2012-03-20 17:31:22 +01:00
Tobias Brunner 38d189eee9 Compiler warning fixed in prf_plus_t. 2012-03-20 17:31:07 +01:00
Martin Willi d4f6686c69 Extended PRF+ by a non-counting variant as used by IKEv1 2012-03-20 17:30:48 +01:00
Tobias Brunner 686cfd4e34 Added support for untruncated MD5 and SHA1 HMACs in ESP as used in RFC 4595.
This requires a Linux kernel >= 2.6.33.
2012-02-27 14:31:19 +01:00
Tobias Brunner 7171d8765e Disable crypto benchmarking if CLOCK_THREAD_CPUTIME_ID is not available. 2012-01-30 11:04:55 +01:00
Adrian-Ken Rueegsegger 5ed3e3a7e6 Various style, typo and whitespace corrections 2012-01-13 16:27:35 +01:00
Tobias Brunner e86b685da5 Allow callers to force ASN.1 date encoding as GENERALIZEDTIME. 2011-12-23 18:07:39 +01:00
Tobias Brunner 1267127c11 Properly ASN.1 encode dates in certificates depending on the year. 2011-12-23 16:29:41 +01:00
Tobias Brunner 5ddeaf2884 Fixed compiler warnings for DH groups that define no subgroup. 2011-11-25 10:18:03 +01:00
Tobias Brunner 10b82be61f pkcs11: Merged the ECDH into the DH implementation. 2011-10-31 18:45:37 +01:00
Andreas Steffen 6a9642e466 Migrated crypto/prf_plus to INIT/METHOD macros 2011-10-02 11:27:38 +02:00
Andreas Steffen 1c55141001 Migrated crypto/pkcs9 to INIT/METHOD macros 2011-10-02 11:21:23 +02:00
Andreas Steffen ae84beff76 Migrated crypto/pkcs7 to INIT/METHOD macros 2011-10-02 11:11:46 +02:00
Tobias Brunner f3bb1bd039 Fixed common misspellings.
Mostly found by 'codespell'.
2011-07-20 16:14:10 +02:00
Tobias Brunner 4f9c691adb Replaced pkcs7_t.create_certificate_iterator with enumerator.
The method is currently not used.
2011-07-06 09:43:45 +02:00
Tobias Brunner e26304348c Replaced simple iterator usages. 2011-07-06 09:43:45 +02:00
Tobias Brunner 28623fc538 "this" removed from comments. 2011-07-06 09:43:45 +02:00
Martin Willi e35727c14d Fix algorithm type for signers, fixes warning with gcc 4.5 2011-05-03 11:33:40 +02:00
Martin Willi f8b26c452a Added proposal keywords for ESN support 2011-04-20 12:26:58 +02:00
Martin Willi 6dc36a73e2 Fixed debug statement if algorithm benchmarking enabled 2011-04-08 14:55:10 +02:00
Andreas Steffen 27a66f9393 implemented wrap around of registered IKEv1 algorithm names 2010-12-26 17:11:02 +01:00
Andreas Steffen 690d5aed59 disable AEAD crypto algorithm if no key size is supported 2010-12-25 16:14:55 +01:00
Andreas Steffen d733a3babb disable crypto algorithm if no key size is supported 2010-12-25 16:11:50 +01:00
Andreas Steffen c6a043fad0 log if an AEAD algorithm does not support a given key size 2010-12-25 15:53:15 +01:00
Andreas Steffen 90288c76f8 log if a crypto algorithm does not support a given key size 2010-12-25 15:49:29 +01:00
Andreas Steffen 5932f41fcc trace back crypto algorithms to the plugins that registered them 2010-12-18 16:31:12 +01:00
Martin Willi 7d7711aba4 Added a generic function to check if a DH group is an EC group 2010-09-03 16:22:10 +02:00
Martin Willi 033fe95f0b Added support for a non-truncated SHA384 HMAC variant, as used by TLS 2010-09-03 14:54:43 +02:00
Martin Willi 0abd558a65 Added a MODP_CUSTOM DH group which takes g and p as constructor arguments 2010-09-02 19:33:08 +02:00
Martin Willi 9d3e174a1e Give a benchmark point for each operation to compare different transforms 2010-08-19 19:05:14 +02:00
Martin Willi 3f6a2d3343 Added proposal strings for Camellia CCM algorithm identifiers 2010-08-19 19:02:34 +02:00
Martin Willi 77b55e8a96 Added support for AEAD algorithms to crypto factory 2010-08-19 19:02:34 +02:00
Martin Willi e09a87d652 Added AEAD support to crypto tester 2010-08-19 19:02:33 +02:00
Martin Willi 7fc4b0814f Make function to test if an encryption algorithm is an AEAD alg public 2010-08-19 19:02:16 +02:00
Martin Willi df8d0d8703 Implemented an AEAD wrapper for traditional crypter/signer transforms 2010-08-19 12:35:54 +02:00
Martin Willi 6c620d5ee0 Test append mode for signers verify_signature 2010-08-19 12:35:53 +02:00
Martin Willi a369a5ece9 Do not free registered algorithms, plugins are responsible for unregistering 2010-08-16 17:06:28 +02:00
Martin Willi 1b0eff58e0 Implemented algorithm benchmarking during registration 2010-08-16 17:06:28 +02:00
Martin Willi e8bf9d6e16 Migrated crypto_factory to INIT/METHOD macros 2010-08-16 17:06:27 +02:00
Martin Willi aed2bf0bd9 Migrated crypto_tester to INIT/METHOD macros 2010-08-16 17:06:27 +02:00
Martin Willi c7776e0aa8 Support Camellia XCBC algorithms in proposal 2010-08-13 17:11:54 +02:00
Martin Willi 5a2dbd5c37 Added private Camellia XCBC identifiers for PRFs and signers 2010-08-13 17:11:53 +02:00
Martin Willi 42cbe87fc7 Implemented AES/Camellia counter mode in gcrypt 2010-08-13 17:11:53 +02:00
Martin Willi 1ee98dbb4a Added Camellia CTR mode proposal keywords 2010-08-13 17:11:53 +02:00
Martin Willi 3102d8669d Use IV length of a crypter instead of block size for IV calculations 2010-08-13 17:11:53 +02:00
Martin Willi f7c04c5b37 Add dedicated getter for the IV size to the crypter_t interface 2010-08-13 17:11:53 +02:00