format(pki): format the pki_import_privkey_buffer function

Signed-off-by: Praneeth Sarode <praneethsarode@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Praneeth Sarode
2025-08-01 00:29:27 +05:30
parent bb85492d4f
commit 957efe51a2

View File

@@ -1376,8 +1376,7 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
key->flags = SSH_KEY_FLAG_PRIVATE | SSH_KEY_FLAG_PUBLIC; key->flags = SSH_KEY_FLAG_PRIVATE | SSH_KEY_FLAG_PUBLIC;
switch (type) { switch (type) {
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA: {
{
ssh_string n = NULL; ssh_string n = NULL;
ssh_string e = NULL; ssh_string e = NULL;
ssh_string d = NULL; ssh_string d = NULL;
@@ -1385,8 +1384,7 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
ssh_string p = NULL; ssh_string p = NULL;
ssh_string q = NULL; ssh_string q = NULL;
rc = ssh_buffer_unpack(buffer, "SSSSSS", &n, &e, &d, rc = ssh_buffer_unpack(buffer, "SSSSSS", &n, &e, &d, &iqmp, &p, &q);
&iqmp, &p, &q);
if (rc != SSH_OK) { if (rc != SSH_OK) {
SSH_LOG(SSH_LOG_TRACE, "Unpack error"); SSH_LOG(SSH_LOG_TRACE, "Unpack error");
goto fail; goto fail;
@@ -1397,9 +1395,7 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
ssh_log_hexdump("n", ssh_string_data(n), ssh_string_len(n)); ssh_log_hexdump("n", ssh_string_data(n), ssh_string_len(n));
ssh_log_hexdump("e", ssh_string_data(e), ssh_string_len(e)); ssh_log_hexdump("e", ssh_string_data(e), ssh_string_len(e));
ssh_log_hexdump("d", ssh_string_data(d), ssh_string_len(d)); ssh_log_hexdump("d", ssh_string_data(d), ssh_string_len(d));
ssh_log_hexdump("iqmp", ssh_log_hexdump("iqmp", ssh_string_data(iqmp), ssh_string_len(iqmp));
ssh_string_data(iqmp),
ssh_string_len(iqmp));
ssh_log_hexdump("p", ssh_string_data(p), ssh_string_len(p)); ssh_log_hexdump("p", ssh_string_data(p), ssh_string_len(p));
ssh_log_hexdump("q", ssh_string_data(q), ssh_string_len(q)); ssh_log_hexdump("q", ssh_string_data(q), ssh_string_len(q));
#endif /* DEBUG_CRYPTO */ #endif /* DEBUG_CRYPTO */
@@ -1419,13 +1415,12 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
SSH_LOG(SSH_LOG_TRACE, "Failed to build RSA private key"); SSH_LOG(SSH_LOG_TRACE, "Failed to build RSA private key");
goto fail; goto fail;
} }
}
break; break;
}
#ifdef HAVE_ECC #ifdef HAVE_ECC
case SSH_KEYTYPE_ECDSA_P256: case SSH_KEYTYPE_ECDSA_P256:
case SSH_KEYTYPE_ECDSA_P384: case SSH_KEYTYPE_ECDSA_P384:
case SSH_KEYTYPE_ECDSA_P521: case SSH_KEYTYPE_ECDSA_P521: {
{
ssh_string e = NULL; ssh_string e = NULL;
ssh_string exp = NULL; ssh_string exp = NULL;
ssh_string i = NULL; ssh_string i = NULL;
@@ -1456,21 +1451,19 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
SSH_LOG(SSH_LOG_TRACE, "Failed to build ECDSA private key"); SSH_LOG(SSH_LOG_TRACE, "Failed to build ECDSA private key");
goto fail; goto fail;
} }
}
break; break;
}
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_ED25519: {
{
ssh_string pubkey = NULL, privkey = NULL; ssh_string pubkey = NULL, privkey = NULL;
if (ssh_fips_mode()) { if (ssh_fips_mode()) {
SSH_LOG(SSH_LOG_TRACE, SSH_LOG(SSH_LOG_TRACE, "Ed25519 keys not supported in FIPS mode");
"Ed25519 keys not supported in FIPS mode");
goto fail; goto fail;
} }
rc = ssh_buffer_unpack(buffer, "SS", &pubkey, &privkey); rc = ssh_buffer_unpack(buffer, "SS", &pubkey, &privkey);
if (rc != SSH_OK){ if (rc != SSH_OK) {
SSH_LOG(SSH_LOG_TRACE, "Unpack error"); SSH_LOG(SSH_LOG_TRACE, "Unpack error");
goto fail; goto fail;
} }
@@ -1483,8 +1476,8 @@ int pki_import_privkey_buffer(enum ssh_keytypes_e type,
SSH_LOG(SSH_LOG_TRACE, "Failed to build ed25519 key"); SSH_LOG(SSH_LOG_TRACE, "Failed to build ed25519 key");
goto fail; goto fail;
} }
}
break; break;
}
case SSH_KEYTYPE_RSA_CERT01: case SSH_KEYTYPE_RSA_CERT01:
case SSH_KEYTYPE_ECDSA_P256_CERT01: case SSH_KEYTYPE_ECDSA_P256_CERT01:
case SSH_KEYTYPE_ECDSA_P384_CERT01: case SSH_KEYTYPE_ECDSA_P384_CERT01: