diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/identity | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/identity')
-rw-r--r-- | src/identity/gnunet-identity.c | 6 | ||||
-rw-r--r-- | src/identity/plugin_rest_identity.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c index cf44afd1f..d0f5546f3 100644 --- a/src/identity/gnunet-identity.c +++ b/src/identity/gnunet-identity.c | |||
@@ -406,7 +406,8 @@ run (void *cls, | |||
406 | GNUNET_STRINGS_string_to_data (privkey_ego, | 406 | GNUNET_STRINGS_string_to_data (privkey_ego, |
407 | strlen (privkey_ego), | 407 | strlen (privkey_ego), |
408 | &pk, | 408 | &pk, |
409 | sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey)); | 409 | sizeof(struct |
410 | GNUNET_CRYPTO_EcdsaPrivateKey)); | ||
410 | create_op = | 411 | create_op = |
411 | GNUNET_IDENTITY_create (sh, | 412 | GNUNET_IDENTITY_create (sh, |
412 | create_ego, | 413 | create_ego, |
@@ -452,7 +453,8 @@ main (int argc, char *const *argv) | |||
452 | GNUNET_GETOPT_option_string ('P', | 453 | GNUNET_GETOPT_option_string ('P', |
453 | "privkey", | 454 | "privkey", |
454 | "PRIVATE_KEY", | 455 | "PRIVATE_KEY", |
455 | gettext_noop ("set the private key for the identity to PRIVATE_KEY (use together with -C)"), | 456 | gettext_noop ( |
457 | "set the private key for the identity to PRIVATE_KEY (use together with -C)"), | ||
456 | &privkey_ego), | 458 | &privkey_ego), |
457 | GNUNET_GETOPT_option_flag ('d', | 459 | GNUNET_GETOPT_option_flag ('d', |
458 | "display", | 460 | "display", |
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c index 5aca07ddf..02e42d03f 100644 --- a/src/identity/plugin_rest_identity.c +++ b/src/identity/plugin_rest_identity.c | |||
@@ -1065,7 +1065,8 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle, | |||
1065 | GNUNET_STRINGS_string_to_data (privkey, | 1065 | GNUNET_STRINGS_string_to_data (privkey, |
1066 | strlen (privkey), | 1066 | strlen (privkey), |
1067 | &pk, | 1067 | &pk, |
1068 | sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey)); | 1068 | sizeof(struct |
1069 | GNUNET_CRYPTO_EcdsaPrivateKey)); | ||
1069 | pk_ptr = &pk; | 1070 | pk_ptr = &pk; |
1070 | } | 1071 | } |
1071 | else | 1072 | else |