Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix segfault when using ECDSA keys. #24

Merged
merged 1 commit into from
Feb 21, 2021
Merged

fix segfault when using ECDSA keys. #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ssh-ecdsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
u_int len, dlen;
Buffer b, bb;
#if OPENSSL_VERSION_NUMBER >= 0x10100005L
BIGNUM *r, *s;
BIGNUM *r = NULL, *s = NULL;
#endif

if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
Expand Down Expand Up @@ -137,20 +137,27 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,

/* parse signature */
if ((sig = ECDSA_SIG_new()) == NULL)
pamsshagentauth_fatal("ssh_ecdsa_verify: DSA_SIG_new failed");
pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_new failed");

pamsshagentauth_buffer_init(&b);
pamsshagentauth_buffer_append(&b, sigblob, len);
#if OPENSSL_VERSION_NUMBER < 0x10100005L
if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
(pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
pamsshagentauth_fatal("ssh_ecdsa_verify:"
"pamsshagentauth_buffer_get_bignum2_ret failed");
#else
DSA_SIG_get0(sig, &r, &s);
if ((r = BN_new()) == NULL)
pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed");
if ((s = BN_new()) == NULL)
pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed");
if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
(pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
#endif
pamsshagentauth_fatal("ssh_ecdsa_verify:"
"pamsshagentauth_buffer_get_bignum2_ret failed");
if (ECDSA_SIG_set0(sig, r, s) != 1)
pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_set0 failed");
#endif

/* clean up */
memset(sigblob, 0, len);
Expand Down