NEED TO BE GENERATED* =) Refer to to entry "2001/01/16 19:20:06"
for more details.
20010118
- (bal) Super Sized OpenBSD Resync
- [email protected] 2001/01/11 22:14:20 GMT 2001 by markus
[sshd.c]
maxfd+1
- [email protected] 2001/01/13 17:59:18
[ssh-keygen.1]
small ssh-keygen manpage cleanup; [email protected]
- [email protected] 2001/01/13 18:03:07
[scp.c ssh-keygen.c sshd.c]
getopt() returns -1 not EOF; [email protected]
- [email protected] 2001/01/13 18:06:54
[ssh-keyscan.c]
use SSH_DEFAULT_PORT; from [email protected]
- [email protected] 2001/01/13 18:12:47
[ssh-keyscan.c]
free() -> xfree(); fix memory leak; from [email protected]
- [email protected] 2001/01/13 18:14:13
[ssh-add.c]
typo, from [email protected]
- [email protected] 2001/01/13 18:32:50
[packet.c session.c ssh.c sshconnect.c sshd.c]
split out keepalive from packet_interactive (from [email protected])
set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too.
- [email protected] 2001/01/13 18:36:45
[packet.c packet.h]
reorder, typo
- [email protected] 2001/01/13 18:38:00
[auth-options.c]
fix comment
- [email protected] 2001/01/13 18:43:31
[session.c]
Wall
- [email protected] 2001/01/13 19:14:08
[clientloop.h clientloop.c ssh.c]
move callback to headerfile
- [email protected] 2001/01/15 21:40:10
[ssh.c]
use log() instead of stderr
- [email protected] 2001/01/15 21:43:51
[dh.c]
use error() not stderr!
- [email protected] 2001/01/15 21:45:29
[sftp-server.c]
rename must fail if newpath exists, debug off by default
- [email protected] 2001/01/15 21:46:38
[sftp-server.c]
readable long listing for sftp-server, ok deraadt@
- [email protected] 2001/01/16 19:20:06
[key.c ssh-rsa.c]
make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from
[email protected]. note that you have to delete older ssh2-rsa keys,
since they are in the wrong format, too. they must be removed from
.ssh/authorized_keys2 and .ssh/known_hosts2, etc.
(cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP
.ssh/authorized_keys2) additionally, we now check that
BN_num_bits(rsa->n) >= 768.
- [email protected] 2001/01/16 20:54:27
[sftp-server.c]
remove some statics. simpler handles; idea from [email protected]
- [email protected] 2001/01/16 23:58:08
[bufaux.c radix.c sshconnect.h sshconnect1.c]
indent
- (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may
be missing such feature.
166 lines
4.5 KiB
C
166 lines
4.5 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.4 2001/01/16 19:20:06 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"
|
|
|
|
/* 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;
|
|
}
|