diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8c23a54cf..2c5c75db7 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.409 2020/05/02 07:19:43 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.409.2.1 2020/05/18 19:02:13 benno Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2950,14 +2950,16 @@ do_download_sk(const char *skprovider, const char *device) | |||
2950 | &keys, &nkeys)) != 0) { | 2950 | &keys, &nkeys)) != 0) { |
2951 | if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE) | 2951 | if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE) |
2952 | continue; | 2952 | continue; |
2953 | freezero(pin, strlen(pin)); | 2953 | if (pin != NULL) |
2954 | freezero(pin, strlen(pin)); | ||
2954 | error("Unable to load resident keys: %s", ssh_err(r)); | 2955 | error("Unable to load resident keys: %s", ssh_err(r)); |
2955 | return -1; | 2956 | return -1; |
2956 | } | 2957 | } |
2957 | } | 2958 | } |
2958 | if (nkeys == 0) | 2959 | if (nkeys == 0) |
2959 | logit("No keys to download"); | 2960 | logit("No keys to download"); |
2960 | freezero(pin, strlen(pin)); | 2961 | if (pin != NULL) |
2962 | freezero(pin, strlen(pin)); | ||
2961 | 2963 | ||
2962 | for (i = 0; i < nkeys; i++) { | 2964 | for (i = 0; i < nkeys; i++) { |
2963 | if (keys[i]->type != KEY_ECDSA_SK && | 2965 | if (keys[i]->type != KEY_ECDSA_SK && |