shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-03-24 20:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

examples: Avoid using deprecated ssh_pki_generate

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Eshan Kelkar <eshankelkar@galorithm.com>
This commit is contained in:
Jakub Jelen
2026-03-12 12:36:58 +01:00
parent def7a679f8
commit c38edb59f2
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/keygen.c
View File

@@ -24,7 +24,7 @@ int main(void)
int rv; int rv;
/* Generate a new ED25519 private key file */ /* Generate a new ED25519 private key file */
rv = ssh_pki_generate(SSH_KEYTYPE_ED25519, 0, &key); rv = ssh_pki_generate_key(SSH_KEYTYPE_ED25519, NULL, &key);
if (rv != SSH_OK) { if (rv != SSH_OK) {
fprintf(stderr, "Failed to generate private key"); fprintf(stderr, "Failed to generate private key");
return -1; return -1;

38
examples/keygen2.c
View File

@@ -35,7 +35,7 @@
struct arguments_st { struct arguments_st {
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
unsigned long bits; int bits;
char *file; char *file;
char *passphrase; char *passphrase;
char *format; char *format;
@@ -321,6 +321,7 @@ list_fingerprint(char *file)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
ssh_pki_ctx ctx = NULL;
ssh_key key = NULL; ssh_key key = NULL;
int ret = EXIT_FAILURE, rc, fd; int ret = EXIT_FAILURE, rc, fd;
char overwrite[1024] = ""; char overwrite[1024] = "";
@@ -394,10 +395,27 @@ int main(int argc, char *argv[])
close(fd); close(fd);
} }
/* Create a new PKI Context if needed -- for other types using NULL is ok */
if (arguments.type == SSH_KEYTYPE_RSA && arguments.bits != 0) {
ctx = ssh_pki_ctx_new();
if (ctx == NULL) {
fprintf(stderr, "Error: Failed to allocate PKI context\n");
goto end;
}
rc = ssh_pki_ctx_options_set(ctx,
SSH_PKI_OPTION_RSA_KEY_SIZE,
&arguments.bits);
if (rc != SSH_OK) {
fprintf(stderr, "Error: Failed to set RSA bit size\n");
goto end;
}
}
/* Generate a new private key */ /* Generate a new private key */
rc = ssh_pki_generate(arguments.type, arguments.bits, &key); rc = ssh_pki_generate_key(arguments.type, ctx, &key);
if (rc != SSH_OK) { if (rc != SSH_OK) {
fprintf(stderr, "Error: Failed to generate keys"); fprintf(stderr, "Error: Failed to generate keys\n");
goto end; goto end;
} }
@@ -503,13 +521,9 @@ int main(int argc, char *argv[])
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
end: end:
if (key != NULL) { ssh_pki_ctx_free(ctx);
ssh_key_free(key); ssh_key_free(key);
} free(arguments.file);
if (arguments.file != NULL) {
free(arguments.file);
}
if (arguments.passphrase != NULL) { if (arguments.passphrase != NULL) {
#ifdef HAVE_EXPLICIT_BZERO #ifdef HAVE_EXPLICIT_BZERO
@@ -520,8 +534,6 @@ end:
free(arguments.passphrase); free(arguments.passphrase);
} }
if (pubkey_file != NULL) { free(pubkey_file);
free(pubkey_file);
}
return ret; return ret;
} }