Commit Graph

419 Commits

Author SHA1 Message Date
踏刃而起 da2e833277 Makefile.am edited online with Bitbucket 2021-03-15 07:20:08 +00:00
Michael_Huang_HAIFA 6759967336 Revert "Debug:"
This reverts commit f49a03ca8c.
2021-03-15 08:03:15 +01:00
Michael_Huang_HAIFA 8814a84f84 Merge branch 'hipv2' of https://bitbucket.org/openhip/openhip into hipv2 2021-03-15 00:19:20 +01:00
Michael_Huang_HAIFA f49a03ca8c Debug: 2021-03-15 00:17:16 +01:00
Michael_Huang_HAIFA 9c7f6863ef Debug:
Fix a bug when calling Keccak Keymat, i.e. sort(HI-I, HI-R) is missing.
What's new?
Add Xoodyak in different modes, such as KEYMAT, XMAC, XHASH, and HIP CIPHER etc.
2021-03-14 23:48:15 +01:00
Johan Hedlin e6ce3a5938
Remove unused variable in hi_to_hhit() to fix compiler error 2020-12-18 11:01:34 +01:00
David Jungmalm 088964b875 Small fix of incorrect input data to hash function 2020-12-18 10:55:32 +01:00
Johan Hedlin 26059344bc
Correct typo X29915 => X25519, add X25519 and X448 primes to dhprime[] and remove unused code 2020-12-18 10:15:08 +01:00
Simon Wrede 199bb65671 Merge branch 'hipv2_orchid_cshake2' into hipv2 2020-11-30 16:44:00 +01:00
Simon Wrede b2411d93b2 Merge branch 'hipv2_new_crypto' into hipv2 2020-11-30 13:37:10 +01:00
Johan Hedlin 52157e5e68
Change ACCEPTABLE_R1_COUNT_RANGE from 2 to 4 and enable Curve25519/448 DH groups 2020-11-28 15:15:04 +01:00
Johan Hedlin 5387af6e1c
Set Keyak cipher and EdDSA/cSHAKE suite as last-place options, restore AES and RSA/DSA as default 2020-11-16 14:27:35 +01:00
Simon Wrede ede4827e19 Mobility test 2020-11-15 23:26:00 +01:00
Johan Hedlin 183e97295c
Remove hard-coded assumption that EdDSA25519 was used, EdDSA448 should now work as well 2020-11-14 11:22:12 +01:00
Johan Hedlin 62230bafaa
Fix incorrect KKDF calculation which only used 1/8 of the key material
HOST_ID in I2 is now sent unencrypted when KKDF is used, so that the HI is available at the responder when the keymat is generated.
2020-11-14 11:22:12 +01:00
Joakim Kahlström b006ad2629 Removed silent fallbacks and added warnings 2020-11-13 11:51:24 +01:00
Johan Hedlin 27835c7b7e
Merge branch 'hipv2_new_tests' into hipv2_new_crypto 2020-11-10 14:23:00 +01:00
Johan Hedlin dc70b9b1b3
Change default HIT suite in hitgen from 0 (reserved) to 1 (RSA/DSA, SHA256) 2020-11-10 14:14:11 +01:00
Johan Hedlin 416588b055
Use OGA ID from HIT in verify_hit() instead of hi->hit_suite_id when selecting HIT generation algorithm 2020-11-10 14:14:10 +01:00
Johan Hedlin 9d9d8d5410
Save entire HIP_MAC_2 parameter (including padding) when parsing R2 to fix signature verification failure 2020-11-10 14:14:10 +01:00
Joakim Kahlström e84c95a1b3 Changed name of build_tlv_hmac() to build_tlv_mac() as it could calculate both hmac and kmac 2020-11-09 14:07:50 +01:00
Simon Wrede 3c6151219b Merged in hipv2_new_tests (pull request #8)
Basic HIP connectivity test
2020-11-06 13:53:04 +00:00
Simon Wrede 25e5e1132c Basic HIP connectivity test
Set up tests compatible with a newer version of CORE (v7.2.1).
Added instructions on how to setup development of tests and running
them.
2020-10-16 12:48:12 +02:00
Johan Hedlin 4056510caf
Use KKDF for keymat generation if EdDSA/cSHAKE128 is selected. Seems to generate keys correctly, but EdDSA/cSHAKE128 needs more work before base exchange can be completed with this suite 2020-10-10 19:25:39 +02:00
Johan Hedlin 909d3a94a3
WIP: Add EdDSA/cSHAKE128 as HIT suite alternative. HI generation, EdDSA signing/verifying, DH exchange and KMAC works. Keymat generation not yet implemented 2020-10-10 19:20:31 +02:00
Johan Hedlin 586b7e5739
Set both hip_a->hit_suite and hip_a->peer_hi->hit_suite_id in handle_hit_suite_list()
Fixes an issue where the peer's HIT suite is left at the default value (0) when the HIT_SUITE_LIST parameter is processed.
2020-10-10 19:06:43 +02:00
Johan Hedlin bff3b27b07
Process HIT_SUITE_LIST from R1 before other parameters to ensure that the used HI algoritm is known when validating the received HIT 2020-10-10 19:04:16 +02:00
Johan Hedlin c3fbe59d8b
Add EdDSA-related constants and helper functions 2020-10-10 18:58:37 +02:00
Johan Hedlin 131723f9a7
Add SHAKE128/256 functions from XKCP 2020-10-10 18:32:21 +02:00
Johan Hedlin f217312347
WIP: Add Keyak as HIP cipher option 2020-09-28 11:15:01 +02:00
Johan Hedlin ef425b8319
Modify XKCP library to allow for Keyak decryption without supplying a tag 2020-09-27 15:55:56 +02:00
Johan Hedlin 84099a0cd5
Add subset of XKCP (eXtended Keccak Code Package) library containing cSHAKE, KMAC and Keyak
XKCP is licensed under CC0 and BSD 3-clause.
2020-09-20 16:54:20 +02:00
Johan Hedlin af9cc8f643
Fix compiler errors caused by duplicated enum entry and strncpy truncation 2020-09-19 18:31:26 +02:00
Johan Hedlin 46659b5ac5
Add parameter constants related to EdDSA and cSHAKE from Internet-Draft "draft-moskowitz-hip-new-crypto-05" 2020-09-19 17:31:29 +02:00
Johan Hedlin 9af42730ee
Fix incorrect IPv4 checksum calculation which skipped every other byte in the IP header
This reverts commit a3eadeca70.
2020-09-18 14:01:13 +02:00
Johan Hedlin c85ade2bb3
Change lengths passed to strncpy + others to prevent reading past end-of-buffer and avoid compiler errors 2020-09-16 13:13:02 +02:00
Fabian Haugen f5b24d3a30 Use src of packet as backup locator. 2019-12-16 07:00:25 +01:00
Fabian Haugen 5b2bcccbf9 Start testing how to add src of packet as a new locator. 2019-12-13 14:48:13 +01:00
Fabian Haugen c9bc74e3a2 Readd space for header when building hit suite. 2019-12-06 15:03:24 +01:00
Fabian Haugen d4e619471f Merge branch 'hipv2-2019' into hipv2 2019-12-06 04:07:28 +01:00
Fabian Haugen ccd4bfeeb7 Avoid reprocessing locators redundant with locators just received. 2019-12-06 04:01:54 +01:00
Niklas Granberg 39bb3a25ee Merge branch 'hipv2' of https://bitbucket.org/openhip/openhip into hipv2 2019-11-22 16:01:24 +01:00
Niklas Granberg 5007a05ce1 Added logging for failed hit suite negotiation 2019-11-22 15:48:02 +01:00
Eric Nylander a3eadeca70 Compatibility issue with ubuntu 18 solved in win32 checksum calculation 2019-11-11 14:26:33 +01:00
Niklas Granberg 4e96ca0913 Fixed holes in hit suite config parsing 2019-11-08 16:11:43 +01:00
Niklas Granberg eb7bda1e8e Wrong way fix, everything else was wrong. 4bit in the global config 2019-11-06 16:56:00 +01:00
Niklas Granberg a08cff5c5e Fixed wrong varible in default case of hit_suites 2019-11-06 16:41:51 +01:00
Fabian Haugen c30cb2f4b4 Merge branch 'hipv2' of bitbucket.org:openhip/openhip into hipv2 2019-10-13 18:21:31 +02:00
Fabian Haugen d041bbde18 Use HKDF for computing keymat. 2019-10-13 18:19:47 +02:00
Niklas Granberg d85b87165a Merge branch 'hipv2' of https://bitbucket.org/openhip/openhip into hipv2 2019-10-13 16:00:35 +02:00