mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-17 23:54:35 +00:00
And I think I have all the bits right from the OpenBSD tree. 20001222 - Updated RCSID for pty.c - (bal) OpenBSD CVS Updates: - markus@cvs.openbsd.org 2000/12/21 15:10:16 [auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c] print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@ - markus@cvs.openbsd.org 2000/12/20 19:26:56 [authfile.c] allow ssh -i userkey for root - markus@cvs.openbsd.org 2000/12/20 19:37:21 [authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h] fix prototypes; from stevesk@pobox.com - markus@cvs.openbsd.org 2000/12/20 19:32:08 [sshd.c] init pointer to NULL; report from Jan.Ivan@cern.ch - markus@cvs.openbsd.org 2000/12/19 23:17:54 [auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c] replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char unsigned' with u_char.
164 lines
4.4 KiB
C
164 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.2 2000/12/19 23:17:58 markus Exp $");
|
|
|
|
#include "ssh.h"
|
|
#include "xmalloc.h"
|
|
#include "buffer.h"
|
|
#include "bufaux.h"
|
|
|
|
#include <openssl/evp.h>
|
|
#include <openssl/dsa.h>
|
|
#include <openssl/rsa.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "key.h"
|
|
|
|
#define INTBLOB_LEN 20
|
|
#define SIGBLOB_LEN (2*INTBLOB_LEN)
|
|
|
|
/* 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;
|
|
}
|
|
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;
|
|
}
|