diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-01 16:08:38 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-01 16:08:38 +0200 |
commit | 2bb07d251cc8eead7a0fcf1c0c7100477f107027 (patch) | |
tree | 7a5416b77e8a8a69e18a3be524fe078cd381c1b0 /src/include/gnunet_crypto_lib.h | |
parent | 754d8c1b496624e5c879af7d142fc9fd34de3a21 (diff) | |
parent | 54b5a20700a1ed27b1067a7cd55329ddc5b0d611 (diff) | |
download | gnunet-2bb07d251cc8eead7a0fcf1c0c7100477f107027.tar.gz gnunet-2bb07d251cc8eead7a0fcf1c0c7100477f107027.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/include/gnunet_crypto_lib.h')
-rw-r--r-- | src/include/gnunet_crypto_lib.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 320701643..f8eef5406 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
@@ -289,6 +289,17 @@ struct GNUNET_CRYPTO_SymmetricSessionKey | |||
289 | unsigned char twofish_key[GNUNET_CRYPTO_AES_KEY_LENGTH]; | 289 | unsigned char twofish_key[GNUNET_CRYPTO_AES_KEY_LENGTH]; |
290 | }; | 290 | }; |
291 | 291 | ||
292 | /** | ||
293 | * Type of a nonce used for challenges. | ||
294 | */ | ||
295 | struct ChallengeNonceP | ||
296 | { | ||
297 | /** | ||
298 | * The value of the nonce. Note that this is NOT a hash. | ||
299 | */ | ||
300 | struct GNUNET_ShortHashCode value; | ||
301 | }; | ||
302 | |||
292 | GNUNET_NETWORK_STRUCT_END | 303 | GNUNET_NETWORK_STRUCT_END |
293 | 304 | ||
294 | /** | 305 | /** |
@@ -1779,7 +1790,7 @@ GNUNET_CRYPTO_eddsa_verify_ ( | |||
1779 | */ | 1790 | */ |
1780 | #define GNUNET_CRYPTO_eddsa_verify(purp,ps,sig,pub) ({ \ | 1791 | #define GNUNET_CRYPTO_eddsa_verify(purp,ps,sig,pub) ({ \ |
1781 | /* check size is set correctly */ \ | 1792 | /* check size is set correctly */ \ |
1782 | GNUNET_assert (htonl ((ps)->purpose.size) == sizeof (*(ps))); \ | 1793 | GNUNET_assert (ntohl ((ps)->purpose.size) == sizeof (*(ps))); \ |
1783 | /* check 'ps' begins with the purpose */ \ | 1794 | /* check 'ps' begins with the purpose */ \ |
1784 | GNUNET_static_assert (((void*) (ps)) == \ | 1795 | GNUNET_static_assert (((void*) (ps)) == \ |
1785 | ((void*) &(ps)->purpose)); \ | 1796 | ((void*) &(ps)->purpose)); \ |