diff options
author | jospaeth <spaethj@in.tum.de> | 2020-05-26 09:08:09 +0200 |
---|---|---|
committer | jospaeth <spaethj@in.tum.de> | 2020-05-26 09:08:09 +0200 |
commit | 7b48b9e292ce90d1d663ca9ce7b2ccc95f0fd00e (patch) | |
tree | 79f47f5f7069bfed2bbfa28ed8274cea03976fd2 /src/include | |
parent | 669aa594e6a4d06e2d77cdba5365f6992695f547 (diff) | |
parent | a32de45ceffeb69038ecfa7b963f30b7fed83a41 (diff) | |
download | gnunet-7b48b9e292ce90d1d663ca9ce7b2ccc95f0fd00e.tar.gz gnunet-7b48b9e292ce90d1d663ca9ce7b2ccc95f0fd00e.zip |
Merge branch 'spaeth/import_identity'
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_identity_service.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index 81af671e2..f4e653598 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h | |||
@@ -233,6 +233,7 @@ typedef void | |||
233 | * | 233 | * |
234 | * @param id identity service to use | 234 | * @param id identity service to use |
235 | * @param name desired name | 235 | * @param name desired name |
236 | * @param privkey desired private key or NULL to create one | ||
236 | * @param cont function to call with the result (will only be called once) | 237 | * @param cont function to call with the result (will only be called once) |
237 | * @param cont_cls closure for @a cont | 238 | * @param cont_cls closure for @a cont |
238 | * @return handle to abort the operation | 239 | * @return handle to abort the operation |
@@ -240,6 +241,7 @@ typedef void | |||
240 | struct GNUNET_IDENTITY_Operation * | 241 | struct GNUNET_IDENTITY_Operation * |
241 | GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id, | 242 | GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id, |
242 | const char *name, | 243 | const char *name, |
244 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey, | ||
243 | GNUNET_IDENTITY_CreateContinuation cont, | 245 | GNUNET_IDENTITY_CreateContinuation cont, |
244 | void *cont_cls); | 246 | void *cont_cls); |
245 | 247 | ||