diff options
author | Nils Durner <durner@gnunet.org> | 2010-07-03 20:38:56 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2010-07-03 20:38:56 +0000 |
commit | 2f3bef0a081d866567c315f2e47dec15b3d122bc (patch) | |
tree | 0be42004174a3c99d467ae21e243830951153dc6 /src/util/crypto_hkdf.c | |
parent | 8f3394592fea6f97b3705967e2a53be96e1dc73b (diff) | |
download | gnunet-2f3bef0a081d866567c315f2e47dec15b3d122bc.tar.gz gnunet-2f3bef0a081d866567c315f2e47dec15b3d122bc.zip |
remove debug info
Diffstat (limited to 'src/util/crypto_hkdf.c')
-rw-r--r-- | src/util/crypto_hkdf.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c index 6a87e496b..cdca69ff4 100644 --- a/src/util/crypto_hkdf.c +++ b/src/util/crypto_hkdf.c | |||
@@ -75,18 +75,6 @@ getPRK (gcry_md_hd_t mac, const void *xts, const unsigned long long xts_len, | |||
75 | return GNUNET_YES; | 75 | return GNUNET_YES; |
76 | } | 76 | } |
77 | 77 | ||
78 | static void dump(void *p, unsigned int l) | ||
79 | { | ||
80 | unsigned int i; | ||
81 | |||
82 | printf("\n"); | ||
83 | for (i = 0; i < l; i++) | ||
84 | { | ||
85 | printf("%2x", (int) ((unsigned char *) p)[i]); | ||
86 | } | ||
87 | printf("\n"); | ||
88 | } | ||
89 | |||
90 | /** | 78 | /** |
91 | * @brief Derive key | 79 | * @brief Derive key |
92 | * @param xtr_algo hash algorithm for the extraction phase, GCRY_MD_... | 80 | * @param xtr_algo hash algorithm for the extraction phase, GCRY_MD_... |
@@ -130,7 +118,6 @@ GNUNET_CRYPTO_hkdf (int xtr_algo, int prf_algo, const void *xts, | |||
130 | if (getPRK (xtr, xts, xts_len, skm, skm_len, prk) | 118 | if (getPRK (xtr, xts, xts_len, skm, skm_len, prk) |
131 | != GNUNET_YES) | 119 | != GNUNET_YES) |
132 | goto hkdf_error; | 120 | goto hkdf_error; |
133 | dump(prk, xtr_len); | ||
134 | 121 | ||
135 | t = out_len / k; | 122 | t = out_len / k; |
136 | d = out_len % k; | 123 | d = out_len % k; |
@@ -143,7 +130,6 @@ dump(prk, xtr_len); | |||
143 | memcpy (plain, ctx, ctx_len); | 130 | memcpy (plain, ctx, ctx_len); |
144 | memset (plain + ctx_len, 1, 1); | 131 | memset (plain + ctx_len, 1, 1); |
145 | gcry_md_reset (prf); | 132 | gcry_md_reset (prf); |
146 | dump(plain, plain_len); | ||
147 | hc = doHMAC (prf, prk, xtr_len, plain, ctx_len + 1); | 133 | hc = doHMAC (prf, prk, xtr_len, plain, ctx_len + 1); |
148 | if (hc == NULL) | 134 | if (hc == NULL) |
149 | goto hkdf_error; | 135 | goto hkdf_error; |
@@ -160,7 +146,6 @@ dump(plain, plain_len); | |||
160 | memcpy (plain, result - k, k); | 146 | memcpy (plain, result - k, k); |
161 | memset (plain + k + ctx_len, i + 1, 1); | 147 | memset (plain + k + ctx_len, i + 1, 1); |
162 | gcry_md_reset (prf); | 148 | gcry_md_reset (prf); |
163 | dump(plain, plain_len); | ||
164 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); | 149 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); |
165 | if (hc == NULL) | 150 | if (hc == NULL) |
166 | goto hkdf_error; | 151 | goto hkdf_error; |
@@ -175,13 +160,11 @@ dump(plain, plain_len); | |||
175 | memcpy (plain, result - k, k); | 160 | memcpy (plain, result - k, k); |
176 | memset (plain + k + ctx_len, i + 1, 1); | 161 | memset (plain + k + ctx_len, i + 1, 1); |
177 | gcry_md_reset (prf); | 162 | gcry_md_reset (prf); |
178 | dump(plain, plain_len); | ||
179 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); | 163 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); |
180 | if (hc == NULL) | 164 | if (hc == NULL) |
181 | goto hkdf_error; | 165 | goto hkdf_error; |
182 | memcpy (result, hc, d); | 166 | memcpy (result, hc, d); |
183 | } | 167 | } |
184 | dump(result - k, out_len); | ||
185 | 168 | ||
186 | ret = GNUNET_YES; | 169 | ret = GNUNET_YES; |
187 | goto hkdf_ok; | 170 | goto hkdf_ok; |