mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-26 03:54:12 +08: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.
163 lines
4.4 KiB
C
163 lines
4.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-rsa.c,v 1.5 2001/01/21 19:05:58 markus Exp $");
|
|
|
|
#include <openssl/evp.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "xmalloc.h"
|
|
#include "log.h"
|
|
#include "buffer.h"
|
|
#include "bufaux.h"
|
|
#include "key.h"
|
|
|
|
/* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
|
|
int
|
|
ssh_rsa_sign(
|
|
Key *key,
|
|
u_char **sigp, int *lenp,
|
|
u_char *data, int datalen)
|
|
{
|
|
EVP_MD *evp_md = EVP_sha1();
|
|
EVP_MD_CTX md;
|
|
u_char *digest, *sig, *ret;
|
|
u_int slen, dlen, len;
|
|
int ok;
|
|
Buffer b;
|
|
|
|
if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {
|
|
error("ssh_rsa_sign: no RSA key");
|
|
return -1;
|
|
}
|
|
slen = RSA_size(key->rsa);
|
|
sig = xmalloc(slen);
|
|
|
|
dlen = evp_md->md_size;
|
|
digest = xmalloc(dlen);
|
|
EVP_DigestInit(&md, evp_md);
|
|
EVP_DigestUpdate(&md, data, datalen);
|
|
EVP_DigestFinal(&md, digest, NULL);
|
|
|
|
ok = RSA_sign(NID_sha1, digest, dlen, sig, &len, key->rsa);
|
|
memset(digest, 'd', dlen);
|
|
xfree(digest);
|
|
|
|
if (ok != 1) {
|
|
int ecode = ERR_get_error();
|
|
error("ssh_rsa_sign: RSA_sign failed: %s", ERR_error_string(ecode, NULL));
|
|
xfree(sig);
|
|
return -1;
|
|
}
|
|
if (len < slen) {
|
|
int diff = slen - len;
|
|
debug("slen %d > len %d", slen, len);
|
|
memmove(sig + diff, sig, len);
|
|
memset(sig, 0, diff);
|
|
} else if (len > slen) {
|
|
error("ssh_rsa_sign: slen %d slen2 %d", slen, len);
|
|
xfree(sig);
|
|
return -1;
|
|
}
|
|
/* encode signature */
|
|
buffer_init(&b);
|
|
buffer_put_cstring(&b, "ssh-rsa");
|
|
buffer_put_string(&b, sig, slen);
|
|
len = buffer_len(&b);
|
|
ret = xmalloc(len);
|
|
memcpy(ret, buffer_ptr(&b), len);
|
|
buffer_free(&b);
|
|
memset(sig, 's', slen);
|
|
xfree(sig);
|
|
|
|
if (lenp != NULL)
|
|
*lenp = len;
|
|
if (sigp != NULL)
|
|
*sigp = ret;
|
|
debug2("ssh_rsa_sign: done");
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
ssh_rsa_verify(
|
|
Key *key,
|
|
u_char *signature, int signaturelen,
|
|
u_char *data, int datalen)
|
|
{
|
|
Buffer b;
|
|
EVP_MD *evp_md = EVP_sha1();
|
|
EVP_MD_CTX md;
|
|
char *ktype;
|
|
u_char *sigblob, *digest;
|
|
u_int len, dlen;
|
|
int rlen;
|
|
int ret;
|
|
|
|
if (key == NULL || key->type != KEY_RSA || key->rsa == NULL) {
|
|
error("ssh_rsa_verify: no RSA key");
|
|
return -1;
|
|
}
|
|
if (BN_num_bits(key->rsa->n) < 768) {
|
|
error("ssh_rsa_verify: n too small: %d bits",
|
|
BN_num_bits(key->rsa->n));
|
|
return -1;
|
|
}
|
|
buffer_init(&b);
|
|
buffer_append(&b, (char *) signature, signaturelen);
|
|
ktype = buffer_get_string(&b, NULL);
|
|
if (strcmp("ssh-rsa", ktype) != 0) {
|
|
error("ssh_rsa_verify: cannot handle type %s", ktype);
|
|
buffer_free(&b);
|
|
xfree(ktype);
|
|
return -1;
|
|
}
|
|
xfree(ktype);
|
|
sigblob = (u_char *)buffer_get_string(&b, &len);
|
|
rlen = buffer_len(&b);
|
|
buffer_free(&b);
|
|
if(rlen != 0) {
|
|
error("ssh_rsa_verify: remaining bytes in signature %d", rlen);
|
|
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);
|
|
|
|
ret = RSA_verify(NID_sha1, digest, dlen, sigblob, len, key->rsa);
|
|
memset(digest, 'd', dlen);
|
|
xfree(digest);
|
|
memset(sigblob, 's', len);
|
|
xfree(sigblob);
|
|
if (ret == 0) {
|
|
int ecode = ERR_get_error();
|
|
error("ssh_rsa_verify: RSA_verify failed: %s", ERR_error_string(ecode, NULL));
|
|
}
|
|
debug("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
|
|
return ret;
|
|
}
|