diff options
| author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-08 20:21:19 +0200 |
|---|---|---|
| committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-08 20:21:19 +0200 |
| commit | 20d82ac39747197d0bd405be6eda05eb9b37cf0c (patch) | |
| tree | 5685504837a0e59f9659c2d0fc28c2158645b2a6 /src/include | |
| parent | de6c96ec6b0893346987ca4edc9abb89705dcfe6 (diff) | |
| parent | dabca343dadda1f4977c3e7fd1c9967a7bbbea4c (diff) | |
| download | gnunet-20d82ac39747197d0bd405be6eda05eb9b37cf0c.tar.gz gnunet-20d82ac39747197d0bd405be6eda05eb9b37cf0c.zip | |
Merge branch 'abe' into identity_abe
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/gnunet_crypto_lib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 8a2763894..d5891bb04 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
| @@ -2186,7 +2186,7 @@ GNUNET_CRYPTO_cpabe_decrypt (const void *block, | |||
| 2186 | void **result); | 2186 | void **result); |
| 2187 | 2187 | ||
| 2188 | ssize_t | 2188 | ssize_t |
| 2189 | GNUNET_CRYPTO_cpabe_serialize_key (struct GNUNET_CRYPTO_AbeKey *key, | 2189 | GNUNET_CRYPTO_cpabe_serialize_key (const struct GNUNET_CRYPTO_AbeKey *key, |
| 2190 | void **result); | 2190 | void **result); |
| 2191 | 2191 | ||
| 2192 | struct GNUNET_CRYPTO_AbeKey* | 2192 | struct GNUNET_CRYPTO_AbeKey* |
| @@ -2194,7 +2194,7 @@ GNUNET_CRYPTO_cpabe_deserialize_key (void *data, | |||
| 2194 | size_t len); | 2194 | size_t len); |
| 2195 | 2195 | ||
| 2196 | ssize_t | 2196 | ssize_t |
| 2197 | GNUNET_CRYPTO_cpabe_serialize_master_key (struct GNUNET_CRYPTO_AbeMasterKey *key, | 2197 | GNUNET_CRYPTO_cpabe_serialize_master_key (const struct GNUNET_CRYPTO_AbeMasterKey *key, |
| 2198 | void **result); | 2198 | void **result); |
| 2199 | 2199 | ||
| 2200 | struct GNUNET_CRYPTO_AbeMasterKey* | 2200 | struct GNUNET_CRYPTO_AbeMasterKey* |