diff options
| author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-09 15:35:01 +0200 |
|---|---|---|
| committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-09 15:35:01 +0200 |
| commit | ae3380b0cc18e3d06631aa5fec348f5dc5a940c9 (patch) | |
| tree | 4a92193fd903806662bdb2dcc3481a57fbb0e51b /src/include | |
| parent | 271f13592c0c5213c7056b252882c467a791a1e5 (diff) | |
| parent | eccfb8e81d488dade09dc4df8a981accd50c6d06 (diff) | |
| download | gnunet-ae3380b0cc18e3d06631aa5fec348f5dc5a940c9.tar.gz gnunet-ae3380b0cc18e3d06631aa5fec348f5dc5a940c9.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 d5891bb04..4d00103ab 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
| @@ -2190,7 +2190,7 @@ 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* |
| 2193 | GNUNET_CRYPTO_cpabe_deserialize_key (void *data, | 2193 | GNUNET_CRYPTO_cpabe_deserialize_key (const void *data, |
| 2194 | size_t len); | 2194 | size_t len); |
| 2195 | 2195 | ||
| 2196 | ssize_t | 2196 | ssize_t |
| @@ -2198,7 +2198,7 @@ GNUNET_CRYPTO_cpabe_serialize_master_key (const struct GNUNET_CRYPTO_AbeMasterKe | |||
| 2198 | void **result); | 2198 | void **result); |
| 2199 | 2199 | ||
| 2200 | struct GNUNET_CRYPTO_AbeMasterKey* | 2200 | struct GNUNET_CRYPTO_AbeMasterKey* |
| 2201 | GNUNET_CRYPTO_cpabe_deserialize_master_key (void *data, | 2201 | GNUNET_CRYPTO_cpabe_deserialize_master_key (const void *data, |
| 2202 | size_t len); | 2202 | size_t len); |
| 2203 | 2203 | ||
| 2204 | 2204 | ||