RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-24 20:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge botch that broke !OPENSSL_HAS_ECC

Browse Source
This commit is contained in:
Damien Miller 2024-08-15 23:35:54 +10:00
parent 2c53d2f32b
commit 4da2a1a7f6
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sshbuf-getput-crypto.c
View File

@ -176,7 +176,7 @@ sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v)
return sshbuf_put_ec(buf, EC_KEY_get0_public_key(v), return sshbuf_put_ec(buf, EC_KEY_get0_public_key(v),
EC_KEY_get0_group(v)); EC_KEY_get0_group(v));
} }
#endif /* OPENSSL_HAS_ECC */
int int
sshbuf_put_ec_pkey(struct sshbuf *buf, EVP_PKEY *pkey) sshbuf_put_ec_pkey(struct sshbuf *buf, EVP_PKEY *pkey)
{ {
@ -186,4 +186,5 @@ sshbuf_put_ec_pkey(struct sshbuf *buf, EVP_PKEY *pkey)
return SSH_ERR_LIBCRYPTO_ERROR; return SSH_ERR_LIBCRYPTO_ERROR;
return sshbuf_put_eckey(buf, ec); return sshbuf_put_eckey(buf, ec);
} }
#endif /* OPENSSL_HAS_ECC */
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */