diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pki.c | 5 | ||||
| -rw-r--r-- | src/pki_crypto.c | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -771,8 +771,8 @@ static int pki_import_pubkey_buffer(ssh_buffer buffer, } } break; - case SSH_KEYTYPE_ECDSA: #ifdef HAVE_ECC + case SSH_KEYTYPE_ECDSA: { ssh_string e; ssh_string i; @@ -1201,8 +1201,8 @@ int ssh_pki_generate(enum ssh_keytypes_e type, int parameter, if(rc == SSH_ERROR) goto error; break; - case SSH_KEYTYPE_ECDSA: #ifdef HAVE_ECC + case SSH_KEYTYPE_ECDSA: rc = pki_key_generate_ecdsa(key, parameter); if (rc == SSH_ERROR) { goto error; @@ -1221,6 +1221,7 @@ int ssh_pki_generate(enum ssh_keytypes_e type, int parameter, case SSH_KEYTYPE_DSS_CERT01: case SSH_KEYTYPE_RSA_CERT01: case SSH_KEYTYPE_UNKNOWN: + default: goto error; } diff --git a/src/pki_crypto.c b/src/pki_crypto.c index e34f197f..2aa0e956 100644 --- a/src/pki_crypto.c +++ b/src/pki_crypto.c @@ -697,8 +697,8 @@ ssh_string pki_private_key_to_pem(const ssh_key key, goto err; } break; - case SSH_KEYTYPE_ECDSA: #ifdef HAVE_ECC + case SSH_KEYTYPE_ECDSA: if (passphrase == NULL) { struct pem_get_password_struct pgp = { auth_fn, auth_data }; @@ -730,6 +730,7 @@ ssh_string pki_private_key_to_pem(const ssh_key key, case SSH_KEYTYPE_DSS_CERT01: case SSH_KEYTYPE_RSA_CERT01: case SSH_KEYTYPE_UNKNOWN: + default: BIO_free(mem); SSH_LOG(SSH_LOG_WARN, "Unkown or invalid private key type %d", key->type); return NULL; |