1
0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00

pki: Add the type as a char pointer.

This commit is contained in:
Andreas Schneider
2013-10-18 22:46:44 +02:00
parent 15e31eb464
commit ac4c5699b1
3 changed files with 6 additions and 2 deletions

View File

@@ -60,6 +60,7 @@ struct ssh_key_struct {
struct ssh_signature_struct {
enum ssh_keytypes_e type;
const char *type_c;
#ifdef HAVE_LIBGCRYPT
gcry_sexp_t dsa_sig;
gcry_sexp_t rsa_sig;

View File

@@ -1118,7 +1118,7 @@ int ssh_pki_export_signature_blob(const ssh_signature sig,
return SSH_ERROR;
}
str = ssh_string_from_char(ssh_key_type_to_char(sig->type));
str = ssh_string_from_char(sig->type_c);
if (str == NULL) {
ssh_buffer_free(buf);
return SSH_ERROR;

View File

@@ -1047,7 +1047,7 @@ ssh_string pki_signature_to_blob(const ssh_signature sig)
break;
#endif
case SSH_KEYTYPE_UNKNOWN:
ssh_pki_log("Unknown signature key type: %d", sig->type);
ssh_pki_log("Unknown signature key type: %s", sig->type_c);
return NULL;
}
@@ -1070,6 +1070,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
}
sig->type = type;
sig->type_c = ssh_key_type_to_char(type);
len = ssh_string_len(sig_blob);
@@ -1309,6 +1310,7 @@ ssh_signature pki_do_sign(const ssh_key privkey,
}
sig->type = privkey->type;
sig->type_c = privkey->type_c;
switch(privkey->type) {
case SSH_KEYTYPE_DSS:
@@ -1368,6 +1370,7 @@ ssh_signature pki_do_sign_sessionid(const ssh_key key,
return NULL;
}
sig->type = key->type;
sig->type_c = key->type_c;
switch(key->type) {
case SSH_KEYTYPE_DSS: