aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2018-04-25 16:25:32 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-06-29 17:18:12 +0200
commitc228fa7631fcc2029d2d14dadab276f94dc39d0c (patch)
tree6f5f3dfc7e4adf48d0fc02eeb1cc29cf15e2d2ef
parent9658d360873b50096bf8427814f36db46739f5da (diff)
downloadlibssh-c228fa7631fcc2029d2d14dadab276f94dc39d0c.tar.gz
libssh-c228fa7631fcc2029d2d14dadab276f94dc39d0c.tar.xz
libssh-c228fa7631fcc2029d2d14dadab276f94dc39d0c.zip
pki: Fix duplicating ed25519 public keys
Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 816234350d45ad5743d4cedecc0ed48cc683ed4f)
-rw-r--r--src/pki_ed25519.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/pki_ed25519.c b/src/pki_ed25519.c
index 37d3c878..a8c07796 100644
--- a/src/pki_ed25519.c
+++ b/src/pki_ed25519.c
@@ -199,24 +199,27 @@ int pki_ed25519_key_cmp(const ssh_key k1,
*/
int pki_ed25519_key_dup(ssh_key new, const ssh_key key)
{
- if (key->ed25519_privkey == NULL || key->ed25519_pubkey == NULL) {
+ if (key->ed25519_privkey == NULL && key->ed25519_pubkey == NULL) {
return SSH_ERROR;
}
- new->ed25519_privkey = malloc(ED25519_SK_LEN);
- if (new->ed25519_privkey == NULL) {
- return SSH_ERROR;
+ if (key->ed25519_privkey != NULL) {
+ new->ed25519_privkey = malloc(ED25519_SK_LEN);
+ if (new->ed25519_privkey == NULL) {
+ return SSH_ERROR;
+ }
+ memcpy(new->ed25519_privkey, key->ed25519_privkey, ED25519_SK_LEN);
}
- new->ed25519_pubkey = malloc(ED25519_PK_LEN);
- if (new->ed25519_privkey == NULL || new->ed25519_pubkey == NULL){
- SAFE_FREE(new->ed25519_privkey);
- return SSH_ERROR;
+ if (key->ed25519_pubkey != NULL) {
+ new->ed25519_pubkey = malloc(ED25519_PK_LEN);
+ if (new->ed25519_pubkey == NULL) {
+ SAFE_FREE(new->ed25519_privkey);
+ return SSH_ERROR;
+ }
+ memcpy(new->ed25519_pubkey, key->ed25519_pubkey, ED25519_PK_LEN);
}
- memcpy(new->ed25519_privkey, key->ed25519_privkey, ED25519_SK_LEN);
- memcpy(new->ed25519_pubkey, key->ed25519_pubkey, ED25519_PK_LEN);
-
return SSH_OK;
}