mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-13 05:35:00 +00:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
217 lines
5.4 KiB
C
217 lines
5.4 KiB
C
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: ssh-dss.c,v 1.4 2001/01/21 19:05:57 markus Exp $");
|
|
|
|
#include <openssl/bn.h>
|
|
#include <openssl/evp.h>
|
|
|
|
#include "xmalloc.h"
|
|
#include "buffer.h"
|
|
#include "bufaux.h"
|
|
#include "compat.h"
|
|
#include "log.h"
|
|
#include "key.h"
|
|
|
|
#define INTBLOB_LEN 20
|
|
#define SIGBLOB_LEN (2*INTBLOB_LEN)
|
|
|
|
int
|
|
ssh_dss_sign(
|
|
Key *key,
|
|
u_char **sigp, int *lenp,
|
|
u_char *data, int datalen)
|
|
{
|
|
u_char *digest;
|
|
u_char *ret;
|
|
DSA_SIG *sig;
|
|
EVP_MD *evp_md = EVP_sha1();
|
|
EVP_MD_CTX md;
|
|
u_int rlen;
|
|
u_int slen;
|
|
u_int len, dlen;
|
|
u_char sigblob[SIGBLOB_LEN];
|
|
Buffer b;
|
|
|
|
if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
|
|
error("ssh_dss_sign: no DSA key");
|
|
return -1;
|
|
}
|
|
dlen = evp_md->md_size;
|
|
digest = xmalloc(dlen);
|
|
EVP_DigestInit(&md, evp_md);
|
|
EVP_DigestUpdate(&md, data, datalen);
|
|
EVP_DigestFinal(&md, digest, NULL);
|
|
|
|
sig = DSA_do_sign(digest, dlen, key->dsa);
|
|
if (sig == NULL) {
|
|
fatal("ssh_dss_sign: cannot sign");
|
|
}
|
|
memset(digest, 0, dlen);
|
|
xfree(digest);
|
|
|
|
rlen = BN_num_bytes(sig->r);
|
|
slen = BN_num_bytes(sig->s);
|
|
if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
|
|
error("bad sig size %d %d", rlen, slen);
|
|
DSA_SIG_free(sig);
|
|
return -1;
|
|
}
|
|
debug("sig size %d %d", rlen, slen);
|
|
|
|
memset(sigblob, 0, SIGBLOB_LEN);
|
|
BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
|
|
BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
|
|
DSA_SIG_free(sig);
|
|
|
|
if (datafellows & SSH_BUG_SIGBLOB) {
|
|
debug("datafellows");
|
|
ret = xmalloc(SIGBLOB_LEN);
|
|
memcpy(ret, sigblob, SIGBLOB_LEN);
|
|
if (lenp != NULL)
|
|
*lenp = SIGBLOB_LEN;
|
|
if (sigp != NULL)
|
|
*sigp = ret;
|
|
} else {
|
|
/* ietf-drafts */
|
|
buffer_init(&b);
|
|
buffer_put_cstring(&b, "ssh-dss");
|
|
buffer_put_string(&b, sigblob, SIGBLOB_LEN);
|
|
len = buffer_len(&b);
|
|
ret = xmalloc(len);
|
|
memcpy(ret, buffer_ptr(&b), len);
|
|
buffer_free(&b);
|
|
if (lenp != NULL)
|
|
*lenp = len;
|
|
if (sigp != NULL)
|
|
*sigp = ret;
|
|
}
|
|
return 0;
|
|
}
|
|
int
|
|
ssh_dss_verify(
|
|
Key *key,
|
|
u_char *signature, int signaturelen,
|
|
u_char *data, int datalen)
|
|
{
|
|
Buffer b;
|
|
u_char *digest;
|
|
DSA_SIG *sig;
|
|
EVP_MD *evp_md = EVP_sha1();
|
|
EVP_MD_CTX md;
|
|
u_char *sigblob;
|
|
char *txt;
|
|
u_int len, dlen;
|
|
int rlen;
|
|
int ret;
|
|
|
|
if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
|
|
error("ssh_dss_verify: no DSA key");
|
|
return -1;
|
|
}
|
|
|
|
if (!(datafellows & SSH_BUG_SIGBLOB) &&
|
|
signaturelen == SIGBLOB_LEN) {
|
|
datafellows |= ~SSH_BUG_SIGBLOB;
|
|
log("autodetect SSH_BUG_SIGBLOB");
|
|
} else if ((datafellows & SSH_BUG_SIGBLOB) &&
|
|
signaturelen != SIGBLOB_LEN) {
|
|
log("autoremove SSH_BUG_SIGBLOB");
|
|
datafellows &= ~SSH_BUG_SIGBLOB;
|
|
}
|
|
|
|
debug("len %d datafellows %d", signaturelen, datafellows);
|
|
|
|
/* fetch signature */
|
|
if (datafellows & SSH_BUG_SIGBLOB) {
|
|
sigblob = signature;
|
|
len = signaturelen;
|
|
} else {
|
|
/* ietf-drafts */
|
|
char *ktype;
|
|
buffer_init(&b);
|
|
buffer_append(&b, (char *) signature, signaturelen);
|
|
ktype = buffer_get_string(&b, NULL);
|
|
if (strcmp("ssh-dss", ktype) != 0) {
|
|
error("ssh_dss_verify: cannot handle type %s", ktype);
|
|
buffer_free(&b);
|
|
return -1;
|
|
}
|
|
sigblob = (u_char *)buffer_get_string(&b, &len);
|
|
rlen = buffer_len(&b);
|
|
if(rlen != 0) {
|
|
error("remaining bytes in signature %d", rlen);
|
|
buffer_free(&b);
|
|
return -1;
|
|
}
|
|
buffer_free(&b);
|
|
xfree(ktype);
|
|
}
|
|
|
|
if (len != SIGBLOB_LEN) {
|
|
fatal("bad sigbloblen %d != SIGBLOB_LEN", len);
|
|
}
|
|
|
|
/* parse signature */
|
|
sig = DSA_SIG_new();
|
|
sig->r = BN_new();
|
|
sig->s = BN_new();
|
|
BN_bin2bn(sigblob, INTBLOB_LEN, sig->r);
|
|
BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s);
|
|
|
|
if (!(datafellows & SSH_BUG_SIGBLOB)) {
|
|
memset(sigblob, 0, len);
|
|
xfree(sigblob);
|
|
}
|
|
|
|
/* sha1 the data */
|
|
dlen = evp_md->md_size;
|
|
digest = xmalloc(dlen);
|
|
EVP_DigestInit(&md, evp_md);
|
|
EVP_DigestUpdate(&md, data, datalen);
|
|
EVP_DigestFinal(&md, digest, NULL);
|
|
|
|
ret = DSA_do_verify(digest, dlen, sig, key->dsa);
|
|
|
|
memset(digest, 0, dlen);
|
|
xfree(digest);
|
|
DSA_SIG_free(sig);
|
|
|
|
switch (ret) {
|
|
case 1:
|
|
txt = "correct";
|
|
break;
|
|
case 0:
|
|
txt = "incorrect";
|
|
break;
|
|
case -1:
|
|
default:
|
|
txt = "error";
|
|
break;
|
|
}
|
|
debug("ssh_dss_verify: signature %s", txt);
|
|
return ret;
|
|
}
|