RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-02 12:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/27 22:30:17

Browse Source 
[ssh-dss.c ssh-ecdsa.c ssh-rsa.c]
     make the original RSA and DSA signing/verification code look more like
     the ECDSA/Ed25519 ones: use key_type_plain() when checking the key type
     rather than tediously listing all variants, use __func__ for debug/
     error messages
This commit is contained in:
Damien Miller 2013-12-29 17:47:50 +11:00
parent 137977180b
commit 3e19295c3a
4 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -34,6 +34,12 @@
- tedu@cvs.openbsd.org 2013/12/21 07:10:47 - tedu@cvs.openbsd.org 2013/12/21 07:10:47
[ssh-keygen.1] [ssh-keygen.1]
small typo small typo
- djm@cvs.openbsd.org 2013/12/27 22:30:17
[ssh-dss.c ssh-ecdsa.c ssh-rsa.c]
make the original RSA and DSA signing/verification code look more like
the ECDSA/Ed25519 ones: use key_type_plain() when checking the key type
rather than tediously listing all variants, use __func__ for debug/
error messages
20131221 20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types. - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

29
ssh-dss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-dss.c,v 1.28 2013/05/17 00:13:14 djm Exp $ */ /* $OpenBSD: ssh-dss.c,v 1.29 2013/12/27 22:30:17 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -53,11 +53,12 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
u_int rlen, slen, len, dlen; u_int rlen, slen, len, dlen;
Buffer b; Buffer b;
if (key == NULL || key->dsa == NULL || (key->type != KEY_DSA && if (key == NULL || key_type_plain(key->type) != KEY_DSA ||
key->type != KEY_DSA_CERT && key->type != KEY_DSA_CERT_V00)) { key->dsa == NULL) {
error("ssh_dss_sign: no DSA key"); error("%s: no DSA key", __func__);
return -1; return -1;
} }
EVP_DigestInit(&md, evp_md); EVP_DigestInit(&md, evp_md);
EVP_DigestUpdate(&md, data, datalen); EVP_DigestUpdate(&md, data, datalen);
EVP_DigestFinal(&md, digest, &dlen); EVP_DigestFinal(&md, digest, &dlen);
@ -117,9 +118,9 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
int rlen, ret; int rlen, ret;
Buffer b; Buffer b;
if (key == NULL || key->dsa == NULL || (key->type != KEY_DSA && if (key == NULL || key_type_plain(key->type) != KEY_DSA ||
key->type != KEY_DSA_CERT && key->type != KEY_DSA_CERT_V00)) { key->dsa == NULL) {
error("ssh_dss_verify: no DSA key"); error("%s: no DSA key", __func__);
return -1; return -1;
} }
@ -135,7 +136,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
buffer_append(&b, signature, signaturelen); buffer_append(&b, signature, signaturelen);
ktype = buffer_get_cstring(&b, NULL); ktype = buffer_get_cstring(&b, NULL);
if (strcmp("ssh-dss", ktype) != 0) { if (strcmp("ssh-dss", ktype) != 0) {
error("ssh_dss_verify: cannot handle type %s", ktype); error("%s: cannot handle type %s", __func__, ktype);
buffer_free(&b); buffer_free(&b);
free(ktype); free(ktype);
return -1; return -1;
@ -145,8 +146,8 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
rlen = buffer_len(&b); rlen = buffer_len(&b);
buffer_free(&b); buffer_free(&b);
if (rlen != 0) { if (rlen != 0) {
error("ssh_dss_verify: " error("%s: remaining bytes in signature %d",
"remaining bytes in signature %d", rlen); __func__, rlen);
free(sigblob); free(sigblob);
return -1; return -1;
} }
@ -158,14 +159,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
/* parse signature */ /* parse signature */
if ((sig = DSA_SIG_new()) == NULL) if ((sig = DSA_SIG_new()) == NULL)
fatal("ssh_dss_verify: DSA_SIG_new failed"); fatal("%s: DSA_SIG_new failed", __func__);
if ((sig->r = BN_new()) == NULL) if ((sig->r = BN_new()) == NULL)
fatal("ssh_dss_verify: BN_new failed"); fatal("%s: BN_new failed", __func__);
if ((sig->s = BN_new()) == NULL) if ((sig->s = BN_new()) == NULL)
fatal("ssh_dss_verify: BN_new failed"); fatal("ssh_dss_verify: BN_new failed");
if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) || if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
(BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL)) (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
fatal("ssh_dss_verify: BN_bin2bn failed"); fatal("%s: BN_bin2bn failed", __func__);
/* clean up */ /* clean up */
memset(sigblob, 0, len); memset(sigblob, 0, len);
@ -181,7 +182,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
DSA_SIG_free(sig); DSA_SIG_free(sig);
debug("ssh_dss_verify: signature %s", debug("%s: signature %s", __func__,
ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error"); ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
return ret; return ret;
} }

12
ssh-ecdsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ecdsa.c,v 1.6 2013/05/17 00:13:14 djm Exp $ */ /* $OpenBSD: ssh-ecdsa.c,v 1.7 2013/12/27 22:30:17 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2010 Damien Miller. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved.
@ -54,11 +54,12 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
u_int len, dlen; u_int len, dlen;
Buffer b, bb; Buffer b, bb;
if (key == NULL || key->ecdsa == NULL || if (key == NULL || key_type_plain(key->type) != KEY_ECDSA ||
(key->type != KEY_ECDSA && key->type != KEY_ECDSA_CERT)) { key->ecdsa == NULL) {
error("%s: no ECDSA key", __func__); error("%s: no ECDSA key", __func__);
return -1; return -1;
} }
evp_md = key_ec_nid_to_evpmd(key->ecdsa_nid); evp_md = key_ec_nid_to_evpmd(key->ecdsa_nid);
EVP_DigestInit(&md, evp_md); EVP_DigestInit(&md, evp_md);
EVP_DigestUpdate(&md, data, datalen); EVP_DigestUpdate(&md, data, datalen);
@ -105,11 +106,12 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
Buffer b, bb; Buffer b, bb;
char *ktype; char *ktype;
if (key == NULL || key->ecdsa == NULL || if (key == NULL || key_type_plain(key->type) != KEY_ECDSA ||
(key->type != KEY_ECDSA && key->type != KEY_ECDSA_CERT)) { key->ecdsa == NULL) {
error("%s: no ECDSA key", __func__); error("%s: no ECDSA key", __func__);
return -1; return -1;
} }
evp_md = key_ec_nid_to_evpmd(key->ecdsa_nid); evp_md = key_ec_nid_to_evpmd(key->ecdsa_nid);
/* fetch signature */ /* fetch signature */

39
ssh-rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-rsa.c,v 1.46 2013/05/17 00:13:14 djm Exp $ */ /* $OpenBSD: ssh-rsa.c,v 1.47 2013/12/27 22:30:17 djm Exp $ */
/* /*
* Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
* *
@ -47,14 +47,15 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
int ok, nid; int ok, nid;
Buffer b; Buffer b;
if (key == NULL || key->rsa == NULL || (key->type != KEY_RSA && if (key == NULL || key_type_plain(key->type) != KEY_RSA ||
key->type != KEY_RSA_CERT && key->type != KEY_RSA_CERT_V00)) { key->rsa == NULL) {
error("ssh_rsa_sign: no RSA key"); error("%s: no RSA key", __func__);
return -1; return -1;
} }
nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid); error("%s: EVP_get_digestbynid %d failed", __func__, nid);
return -1; return -1;
} }
EVP_DigestInit(&md, evp_md); EVP_DigestInit(&md, evp_md);
@ -70,7 +71,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
if (ok != 1) { if (ok != 1) {
int ecode = ERR_get_error(); int ecode = ERR_get_error();
error("ssh_rsa_sign: RSA_sign failed: %s", error("%s: RSA_sign failed: %s", __func__,
ERR_error_string(ecode, NULL)); ERR_error_string(ecode, NULL));
free(sig); free(sig);
return -1; return -1;
@ -81,7 +82,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
memmove(sig + diff, sig, len); memmove(sig + diff, sig, len);
memset(sig, 0, diff); memset(sig, 0, diff);
} else if (len > slen) { } else if (len > slen) {
error("ssh_rsa_sign: slen %u slen2 %u", slen, len); error("%s: slen %u slen2 %u", __func__, slen, len);
free(sig); free(sig);
return -1; return -1;
} }
@ -115,21 +116,23 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
u_int len, dlen, modlen; u_int len, dlen, modlen;
int rlen, ret, nid; int rlen, ret, nid;
if (key == NULL || key->rsa == NULL || (key->type != KEY_RSA && if (key == NULL || key_type_plain(key->type) != KEY_RSA ||
key->type != KEY_RSA_CERT && key->type != KEY_RSA_CERT_V00)) { key->rsa == NULL) {
error("ssh_rsa_verify: no RSA key"); error("%s: no RSA key", __func__);
return -1; return -1;
} }
if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) { if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
error("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits", error("%s: RSA modulus too small: %d < minimum %d bits",
BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE); __func__, BN_num_bits(key->rsa->n),
SSH_RSA_MINIMUM_MODULUS_SIZE);
return -1; return -1;
} }
buffer_init(&b); buffer_init(&b);
buffer_append(&b, signature, signaturelen); buffer_append(&b, signature, signaturelen);
ktype = buffer_get_cstring(&b, NULL); ktype = buffer_get_cstring(&b, NULL);
if (strcmp("ssh-rsa", ktype) != 0) { if (strcmp("ssh-rsa", ktype) != 0) {
error("ssh_rsa_verify: cannot handle type %s", ktype); error("%s: cannot handle type %s", __func__, ktype);
buffer_free(&b); buffer_free(&b);
free(ktype); free(ktype);
return -1; return -1;
@ -139,19 +142,19 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
rlen = buffer_len(&b); rlen = buffer_len(&b);
buffer_free(&b); buffer_free(&b);
if (rlen != 0) { if (rlen != 0) {
error("ssh_rsa_verify: remaining bytes in signature %d", rlen); error("%s: remaining bytes in signature %d", __func__, rlen);
free(sigblob); free(sigblob);
return -1; return -1;
} }
/* RSA_verify expects a signature of RSA_size */ /* RSA_verify expects a signature of RSA_size */
modlen = RSA_size(key->rsa); modlen = RSA_size(key->rsa);
if (len > modlen) { if (len > modlen) {
error("ssh_rsa_verify: len %u > modlen %u", len, modlen); error("%s: len %u > modlen %u", __func__, len, modlen);
free(sigblob); free(sigblob);
return -1; return -1;
} else if (len < modlen) { } else if (len < modlen) {
u_int diff = modlen - len; u_int diff = modlen - len;
debug("ssh_rsa_verify: add padding: modlen %u > len %u", debug("%s: add padding: modlen %u > len %u", __func__,
modlen, len); modlen, len);
sigblob = xrealloc(sigblob, 1, modlen); sigblob = xrealloc(sigblob, 1, modlen);
memmove(sigblob + diff, sigblob, len); memmove(sigblob + diff, sigblob, len);
@ -160,7 +163,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
} }
nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1; nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
if ((evp_md = EVP_get_digestbynid(nid)) == NULL) { if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
error("ssh_rsa_verify: EVP_get_digestbynid %d failed", nid); error("%s: EVP_get_digestbynid %d failed", __func__, nid);
free(sigblob); free(sigblob);
return -1; return -1;
} }
@ -172,7 +175,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
memset(digest, 'd', sizeof(digest)); memset(digest, 'd', sizeof(digest));
memset(sigblob, 's', len); memset(sigblob, 's', len);
free(sigblob); free(sigblob);
debug("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : ""); debug("%s: signature %scorrect", __func__, (ret == 0) ? "in" : "");
return ret; return ret;
} }