diff options
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/crypto_ecc.c | 8 | ||||
-rw-r--r-- | src/util/gnunet-crypto-tvg.c | 58 | ||||
-rw-r--r-- | src/util/perf_crypto_asymmetric.c | 14 | ||||
-rw-r--r-- | src/util/test_crypto_ecdsa.c | 33 | ||||
-rw-r--r-- | src/util/test_crypto_eddsa.c | 13 |
5 files changed, 69 insertions, 57 deletions
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c index d2cbe9450..4c1169f43 100644 --- a/src/util/crypto_ecc.c +++ b/src/util/crypto_ecc.c | |||
@@ -688,7 +688,7 @@ data_to_ecdsa_value (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose) | |||
688 | * @return #GNUNET_SYSERR on error, #GNUNET_OK on success | 688 | * @return #GNUNET_SYSERR on error, #GNUNET_OK on success |
689 | */ | 689 | */ |
690 | int | 690 | int |
691 | GNUNET_CRYPTO_ecdsa_sign ( | 691 | GNUNET_CRYPTO_ecdsa_sign_ ( |
692 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv, | 692 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv, |
693 | const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, | 693 | const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, |
694 | struct GNUNET_CRYPTO_EcdsaSignature *sig) | 694 | struct GNUNET_CRYPTO_EcdsaSignature *sig) |
@@ -750,7 +750,7 @@ GNUNET_CRYPTO_ecdsa_sign ( | |||
750 | * @return #GNUNET_SYSERR on error, #GNUNET_OK on success | 750 | * @return #GNUNET_SYSERR on error, #GNUNET_OK on success |
751 | */ | 751 | */ |
752 | int | 752 | int |
753 | GNUNET_CRYPTO_eddsa_sign ( | 753 | GNUNET_CRYPTO_eddsa_sign_ ( |
754 | const struct GNUNET_CRYPTO_EddsaPrivateKey *priv, | 754 | const struct GNUNET_CRYPTO_EddsaPrivateKey *priv, |
755 | const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, | 755 | const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, |
756 | struct GNUNET_CRYPTO_EddsaSignature *sig) | 756 | struct GNUNET_CRYPTO_EddsaSignature *sig) |
@@ -786,7 +786,7 @@ GNUNET_CRYPTO_eddsa_sign ( | |||
786 | * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid | 786 | * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid |
787 | */ | 787 | */ |
788 | int | 788 | int |
789 | GNUNET_CRYPTO_ecdsa_verify ( | 789 | GNUNET_CRYPTO_ecdsa_verify_ ( |
790 | uint32_t purpose, | 790 | uint32_t purpose, |
791 | const struct GNUNET_CRYPTO_EccSignaturePurpose *validate, | 791 | const struct GNUNET_CRYPTO_EccSignaturePurpose *validate, |
792 | const struct GNUNET_CRYPTO_EcdsaSignature *sig, | 792 | const struct GNUNET_CRYPTO_EcdsaSignature *sig, |
@@ -860,7 +860,7 @@ GNUNET_CRYPTO_ecdsa_verify ( | |||
860 | * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid | 860 | * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid |
861 | */ | 861 | */ |
862 | int | 862 | int |
863 | GNUNET_CRYPTO_eddsa_verify ( | 863 | GNUNET_CRYPTO_eddsa_verify_ ( |
864 | uint32_t purpose, | 864 | uint32_t purpose, |
865 | const struct GNUNET_CRYPTO_EccSignaturePurpose *validate, | 865 | const struct GNUNET_CRYPTO_EccSignaturePurpose *validate, |
866 | const struct GNUNET_CRYPTO_EddsaSignature *sig, | 866 | const struct GNUNET_CRYPTO_EddsaSignature *sig, |
diff --git a/src/util/gnunet-crypto-tvg.c b/src/util/gnunet-crypto-tvg.c index a09a6ff50..e0ef9a622 100644 --- a/src/util/gnunet-crypto-tvg.c +++ b/src/util/gnunet-crypto-tvg.c | |||
@@ -124,16 +124,19 @@ run (void *cls, | |||
124 | struct GNUNET_CRYPTO_EddsaPublicKey pub; | 124 | struct GNUNET_CRYPTO_EddsaPublicKey pub; |
125 | struct GNUNET_CRYPTO_EddsaSignature sig; | 125 | struct GNUNET_CRYPTO_EddsaSignature sig; |
126 | struct TestSignatureDataPS data = { 0 }; | 126 | struct TestSignatureDataPS data = { 0 }; |
127 | |||
127 | priv = GNUNET_CRYPTO_eddsa_key_create (); | 128 | priv = GNUNET_CRYPTO_eddsa_key_create (); |
128 | GNUNET_CRYPTO_eddsa_key_get_public (priv, &pub); | 129 | GNUNET_CRYPTO_eddsa_key_get_public (priv, &pub); |
129 | data.purpose.size = htonl (sizeof (struct TestSignatureDataPS)); | 130 | data.purpose.size = htonl (sizeof (data)); |
130 | data.purpose.size = htonl (GNUNET_SIGNATURE_PURPOSE_TEST); | 131 | data.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST); |
131 | GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_eddsa_sign (priv, &data.purpose, | 132 | GNUNET_CRYPTO_eddsa_sign (priv, |
132 | &sig)); | 133 | &data, |
133 | GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_eddsa_verify (0, | 134 | &sig); |
134 | &data.purpose, | 135 | GNUNET_assert (GNUNET_OK == |
135 | &sig, | 136 | GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, |
136 | &pub)); | 137 | &data, |
138 | &sig, | ||
139 | &pub)); | ||
137 | 140 | ||
138 | printf ("eddsa sig:\n"); | 141 | printf ("eddsa sig:\n"); |
139 | display_data (" priv", priv, sizeof (struct | 142 | display_data (" priv", priv, sizeof (struct |
@@ -151,15 +154,16 @@ run (void *cls, | |||
151 | char *salt = "I'm very salty"; | 154 | char *salt = "I'm very salty"; |
152 | char *ctx = "I'm a context chunk, also known as 'info' in the RFC"; | 155 | char *ctx = "I'm a context chunk, also known as 'info' in the RFC"; |
153 | 156 | ||
154 | GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_kdf (&out, | 157 | GNUNET_assert (GNUNET_OK == |
155 | out_len, | 158 | GNUNET_CRYPTO_kdf (&out, |
156 | salt, | 159 | out_len, |
157 | strlen (salt), | 160 | salt, |
158 | ikm, | 161 | strlen (salt), |
159 | strlen (ikm), | 162 | ikm, |
160 | ctx, | 163 | strlen (ikm), |
161 | strlen (ctx), | 164 | ctx, |
162 | NULL)); | 165 | strlen (ctx), |
166 | NULL)); | ||
163 | 167 | ||
164 | printf ("kdf:\n"); | 168 | printf ("kdf:\n"); |
165 | display_data (" salt", salt, strlen (salt)); | 169 | display_data (" salt", salt, strlen (salt)); |
@@ -210,15 +214,19 @@ run (void *cls, | |||
210 | size_t sig_enc_length; | 214 | size_t sig_enc_length; |
211 | skey = GNUNET_CRYPTO_rsa_private_key_create (2048); | 215 | skey = GNUNET_CRYPTO_rsa_private_key_create (2048); |
212 | pkey = GNUNET_CRYPTO_rsa_private_key_get_public (skey); | 216 | pkey = GNUNET_CRYPTO_rsa_private_key_get_public (skey); |
213 | GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, &message_hash, | 217 | GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, |
218 | &message_hash, | ||
214 | sizeof (struct GNUNET_HashCode)); | 219 | sizeof (struct GNUNET_HashCode)); |
215 | GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, &bks, sizeof (struct | 220 | GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, |
216 | GNUNET_CRYPTO_RsaBlindingKeySecret)); | 221 | &bks, |
217 | GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_rsa_blind (&message_hash, | 222 | sizeof (struct |
218 | &bks, | 223 | GNUNET_CRYPTO_RsaBlindingKeySecret)); |
219 | pkey, | 224 | GNUNET_assert (GNUNET_YES == |
220 | &blinded_data, | 225 | GNUNET_CRYPTO_rsa_blind (&message_hash, |
221 | &blinded_len)); | 226 | &bks, |
227 | pkey, | ||
228 | &blinded_data, | ||
229 | &blinded_len)); | ||
222 | blinded_sig = GNUNET_CRYPTO_rsa_sign_blinded (skey, blinded_data, | 230 | blinded_sig = GNUNET_CRYPTO_rsa_sign_blinded (skey, blinded_data, |
223 | blinded_len); | 231 | blinded_len); |
224 | sig = GNUNET_CRYPTO_rsa_unblind (blinded_sig, &bks, pkey); | 232 | sig = GNUNET_CRYPTO_rsa_unblind (blinded_sig, &bks, pkey); |
diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c index 7594733b0..49d9ec644 100644 --- a/src/util/perf_crypto_asymmetric.c +++ b/src/util/perf_crypto_asymmetric.c | |||
@@ -93,18 +93,18 @@ main (int argc, char *argv[]) | |||
93 | start = GNUNET_TIME_absolute_get (); | 93 | start = GNUNET_TIME_absolute_get (); |
94 | for (i = 0; i < l; i++) | 94 | for (i = 0; i < l; i++) |
95 | GNUNET_assert (GNUNET_OK == | 95 | GNUNET_assert (GNUNET_OK == |
96 | GNUNET_CRYPTO_eddsa_sign (eddsa[i], | 96 | GNUNET_CRYPTO_eddsa_sign_ (eddsa[i], |
97 | &sig[i].purp, | 97 | &sig[i].purp, |
98 | &sig[i].sig)); | 98 | &sig[i].sig)); |
99 | log_duration ("EdDSA", "sign HashCode"); | 99 | log_duration ("EdDSA", "sign HashCode"); |
100 | 100 | ||
101 | start = GNUNET_TIME_absolute_get (); | 101 | start = GNUNET_TIME_absolute_get (); |
102 | for (i = 0; i < l; i++) | 102 | for (i = 0; i < l; i++) |
103 | GNUNET_assert (GNUNET_OK == | 103 | GNUNET_assert (GNUNET_OK == |
104 | GNUNET_CRYPTO_eddsa_verify (0, | 104 | GNUNET_CRYPTO_eddsa_verify_ (0, |
105 | &sig[i].purp, | 105 | &sig[i].purp, |
106 | &sig[i].sig, | 106 | &sig[i].sig, |
107 | &dspub[i])); | 107 | &dspub[i])); |
108 | log_duration ("EdDSA", "verify HashCode"); | 108 | log_duration ("EdDSA", "verify HashCode"); |
109 | 109 | ||
110 | start = GNUNET_TIME_absolute_get (); | 110 | start = GNUNET_TIME_absolute_get (); |
diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c index 826097d52..190c58d7d 100644 --- a/src/util/test_crypto_ecdsa.c +++ b/src/util/test_crypto_ecdsa.c | |||
@@ -55,7 +55,8 @@ testSignVerify () | |||
55 | for (i = 0; i < ITER; i++) | 55 | for (i = 0; i < ITER; i++) |
56 | { | 56 | { |
57 | fprintf (stderr, "%s", "."); fflush (stderr); | 57 | fprintf (stderr, "%s", "."); fflush (stderr); |
58 | if (GNUNET_SYSERR == GNUNET_CRYPTO_ecdsa_sign (key, &purp, &sig)) | 58 | if (GNUNET_SYSERR == |
59 | GNUNET_CRYPTO_ecdsa_sign_ (key, &purp, &sig)) | ||
59 | { | 60 | { |
60 | fprintf (stderr, | 61 | fprintf (stderr, |
61 | "%s", | 62 | "%s", |
@@ -64,16 +65,18 @@ testSignVerify () | |||
64 | continue; | 65 | continue; |
65 | } | 66 | } |
66 | if (GNUNET_SYSERR == | 67 | if (GNUNET_SYSERR == |
67 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, &purp, &sig, | 68 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_TEST, |
68 | &pkey)) | 69 | &purp, &sig, |
70 | &pkey)) | ||
69 | { | 71 | { |
70 | printf ("GNUNET_CRYPTO_ecdsa_verify failed!\n"); | 72 | printf ("GNUNET_CRYPTO_ecdsa_verify failed!\n"); |
71 | ok = GNUNET_SYSERR; | 73 | ok = GNUNET_SYSERR; |
72 | continue; | 74 | continue; |
73 | } | 75 | } |
74 | if (GNUNET_SYSERR != | 76 | if (GNUNET_SYSERR != |
75 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, | 77 | GNUNET_CRYPTO_ecdsa_verify_ ( |
76 | &purp, &sig, &pkey)) | 78 | GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, |
79 | &purp, &sig, &pkey)) | ||
77 | { | 80 | { |
78 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); | 81 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); |
79 | ok = GNUNET_SYSERR; | 82 | ok = GNUNET_SYSERR; |
@@ -104,33 +107,33 @@ testDeriveSignVerify () | |||
104 | purp.size = htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)); | 107 | purp.size = htonl (sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose)); |
105 | purp.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST); | 108 | purp.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST); |
106 | 109 | ||
107 | if (GNUNET_SYSERR == GNUNET_CRYPTO_ecdsa_sign (dpriv, &purp, &sig)) | 110 | if (GNUNET_SYSERR == GNUNET_CRYPTO_ecdsa_sign_ (dpriv, &purp, &sig)) |
108 | { | 111 | { |
109 | fprintf (stderr, "%s", "GNUNET_CRYPTO_ecdsa_sign returned SYSERR\n"); | 112 | fprintf (stderr, "%s", "GNUNET_CRYPTO_ecdsa_sign returned SYSERR\n"); |
110 | GNUNET_free (dpriv); | 113 | GNUNET_free (dpriv); |
111 | return GNUNET_SYSERR; | 114 | return GNUNET_SYSERR; |
112 | } | 115 | } |
113 | if (GNUNET_SYSERR == | 116 | if (GNUNET_SYSERR == |
114 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, | 117 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_TEST, |
115 | &purp, &sig, | 118 | &purp, &sig, |
116 | &dpub)) | 119 | &dpub)) |
117 | { | 120 | { |
118 | printf ("GNUNET_CRYPTO_ecdsa_verify failed!\n"); | 121 | printf ("GNUNET_CRYPTO_ecdsa_verify failed!\n"); |
119 | GNUNET_free (dpriv); | 122 | GNUNET_free (dpriv); |
120 | return GNUNET_SYSERR; | 123 | return GNUNET_SYSERR; |
121 | } | 124 | } |
122 | if (GNUNET_SYSERR != | 125 | if (GNUNET_SYSERR != |
123 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, | 126 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_TEST, |
124 | &purp, &sig, | 127 | &purp, &sig, |
125 | &pkey)) | 128 | &pkey)) |
126 | { | 129 | { |
127 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); | 130 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); |
128 | GNUNET_free (dpriv); | 131 | GNUNET_free (dpriv); |
129 | return GNUNET_SYSERR; | 132 | return GNUNET_SYSERR; |
130 | } | 133 | } |
131 | if (GNUNET_SYSERR != | 134 | if (GNUNET_SYSERR != |
132 | GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, | 135 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, |
133 | &purp, &sig, &dpub)) | 136 | &purp, &sig, &dpub)) |
134 | { | 137 | { |
135 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); | 138 | printf ("GNUNET_CRYPTO_ecdsa_verify failed to fail!\n"); |
136 | GNUNET_free (dpriv); | 139 | GNUNET_free (dpriv); |
@@ -160,7 +163,7 @@ testSignPerformance () | |||
160 | for (i = 0; i < ITER; i++) | 163 | for (i = 0; i < ITER; i++) |
161 | { | 164 | { |
162 | fprintf (stderr, "%s", "."); fflush (stderr); | 165 | fprintf (stderr, "%s", "."); fflush (stderr); |
163 | if (GNUNET_SYSERR == GNUNET_CRYPTO_ecdsa_sign (key, &purp, &sig)) | 166 | if (GNUNET_SYSERR == GNUNET_CRYPTO_ecdsa_sign_ (key, &purp, &sig)) |
164 | { | 167 | { |
165 | fprintf (stderr, "%s", | 168 | fprintf (stderr, "%s", |
166 | "GNUNET_CRYPTO_ecdsa_sign returned SYSERR\n"); | 169 | "GNUNET_CRYPTO_ecdsa_sign returned SYSERR\n"); |
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c index c0ad387e1..87990cbac 100644 --- a/src/util/test_crypto_eddsa.c +++ b/src/util/test_crypto_eddsa.c | |||
@@ -56,23 +56,24 @@ testSignVerify () | |||
56 | for (unsigned int i = 0; i < ITER; i++) | 56 | for (unsigned int i = 0; i < ITER; i++) |
57 | { | 57 | { |
58 | fprintf (stderr, "%s", "."); fflush (stderr); | 58 | fprintf (stderr, "%s", "."); fflush (stderr); |
59 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) | 59 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign_ (key, &purp, &sig)) |
60 | { | 60 | { |
61 | fprintf (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); | 61 | fprintf (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); |
62 | ok = GNUNET_SYSERR; | 62 | ok = GNUNET_SYSERR; |
63 | continue; | 63 | continue; |
64 | } | 64 | } |
65 | if (GNUNET_SYSERR == | 65 | if (GNUNET_SYSERR == |
66 | GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, &purp, &sig, | 66 | GNUNET_CRYPTO_eddsa_verify_ (GNUNET_SIGNATURE_PURPOSE_TEST, &purp, &sig, |
67 | &pkey)) | 67 | &pkey)) |
68 | { | 68 | { |
69 | printf ("GNUNET_CRYPTO_eddsa_verify failed!\n"); | 69 | printf ("GNUNET_CRYPTO_eddsa_verify failed!\n"); |
70 | ok = GNUNET_SYSERR; | 70 | ok = GNUNET_SYSERR; |
71 | continue; | 71 | continue; |
72 | } | 72 | } |
73 | if (GNUNET_SYSERR != | 73 | if (GNUNET_SYSERR != |
74 | GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, | 74 | GNUNET_CRYPTO_eddsa_verify_ ( |
75 | &purp, &sig, &pkey)) | 75 | GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, |
76 | &purp, &sig, &pkey)) | ||
76 | { | 77 | { |
77 | printf ("GNUNET_CRYPTO_eddsa_verify failed to fail!\n"); | 78 | printf ("GNUNET_CRYPTO_eddsa_verify failed to fail!\n"); |
78 | ok = GNUNET_SYSERR; | 79 | ok = GNUNET_SYSERR; |
@@ -105,7 +106,7 @@ testSignPerformance () | |||
105 | for (unsigned int i = 0; i < ITER; i++) | 106 | for (unsigned int i = 0; i < ITER; i++) |
106 | { | 107 | { |
107 | fprintf (stderr, "%s", "."); fflush (stderr); | 108 | fprintf (stderr, "%s", "."); fflush (stderr); |
108 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) | 109 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign_ (key, &purp, &sig)) |
109 | { | 110 | { |
110 | fprintf (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); | 111 | fprintf (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); |
111 | ok = GNUNET_SYSERR; | 112 | ok = GNUNET_SYSERR; |