mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-19 08:00:59 +00:00
bf555ba621
NEED TO BE GENERATED* =) Refer to to entry "2001/01/16 19:20:06" for more details. 20010118 - (bal) Super Sized OpenBSD Resync - markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus [sshd.c] maxfd+1 - markus@cvs.openbsd.org 2001/01/13 17:59:18 [ssh-keygen.1] small ssh-keygen manpage cleanup; stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:03:07 [scp.c ssh-keygen.c sshd.c] getopt() returns -1 not EOF; stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:06:54 [ssh-keyscan.c] use SSH_DEFAULT_PORT; from stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:12:47 [ssh-keyscan.c] free() -> xfree(); fix memory leak; from stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:14:13 [ssh-add.c] typo, from stevesk@sweden.hp.com - markus@cvs.openbsd.org 2001/01/13 18:32:50 [packet.c session.c ssh.c sshconnect.c sshd.c] split out keepalive from packet_interactive (from dale@accentre.com) set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too. - markus@cvs.openbsd.org 2001/01/13 18:36:45 [packet.c packet.h] reorder, typo - markus@cvs.openbsd.org 2001/01/13 18:38:00 [auth-options.c] fix comment - markus@cvs.openbsd.org 2001/01/13 18:43:31 [session.c] Wall - markus@cvs.openbsd.org 2001/01/13 19:14:08 [clientloop.h clientloop.c ssh.c] move callback to headerfile - markus@cvs.openbsd.org 2001/01/15 21:40:10 [ssh.c] use log() instead of stderr - markus@cvs.openbsd.org 2001/01/15 21:43:51 [dh.c] use error() not stderr! - markus@cvs.openbsd.org 2001/01/15 21:45:29 [sftp-server.c] rename must fail if newpath exists, debug off by default - markus@cvs.openbsd.org 2001/01/15 21:46:38 [sftp-server.c] readable long listing for sftp-server, ok deraadt@ - markus@cvs.openbsd.org 2001/01/16 19:20:06 [key.c ssh-rsa.c] make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from galb@vandyke.com. 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. - markus@cvs.openbsd.org 2001/01/16 20:54:27 [sftp-server.c] remove some statics. simpler handles; idea from nisse@lysator.liu.se - deraadt@cvs.openbsd.org 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.
156 lines
3.8 KiB
C
156 lines
3.8 KiB
C
/*
|
|
* Copyright (c) 2000 Niels Provos. 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: dh.c,v 1.4 2001/01/15 21:43:51 markus Exp $");
|
|
|
|
#include "xmalloc.h"
|
|
|
|
#include <openssl/bn.h>
|
|
#include <openssl/dh.h>
|
|
#include <openssl/evp.h>
|
|
|
|
#include "ssh.h"
|
|
#include "buffer.h"
|
|
#include "kex.h"
|
|
#include "dh.h"
|
|
|
|
int
|
|
parse_prime(int linenum, char *line, struct dhgroup *dhg)
|
|
{
|
|
char *cp, *arg;
|
|
char *strsize, *gen, *prime;
|
|
|
|
cp = line;
|
|
arg = strdelim(&cp);
|
|
/* Ignore leading whitespace */
|
|
if (*arg == '\0')
|
|
arg = strdelim(&cp);
|
|
if (!*arg || *arg == '#')
|
|
return 0;
|
|
|
|
/* time */
|
|
if (cp == NULL || *arg == '\0')
|
|
goto fail;
|
|
arg = strsep(&cp, " "); /* type */
|
|
if (cp == NULL || *arg == '\0')
|
|
goto fail;
|
|
arg = strsep(&cp, " "); /* tests */
|
|
if (cp == NULL || *arg == '\0')
|
|
goto fail;
|
|
arg = strsep(&cp, " "); /* tries */
|
|
if (cp == NULL || *arg == '\0')
|
|
goto fail;
|
|
strsize = strsep(&cp, " "); /* size */
|
|
if (cp == NULL || *strsize == '\0' ||
|
|
(dhg->size = atoi(strsize)) == 0)
|
|
goto fail;
|
|
gen = strsep(&cp, " "); /* gen */
|
|
if (cp == NULL || *gen == '\0')
|
|
goto fail;
|
|
prime = strsep(&cp, " "); /* prime */
|
|
if (cp != NULL || *prime == '\0')
|
|
goto fail;
|
|
|
|
dhg->g = BN_new();
|
|
if (BN_hex2bn(&dhg->g, gen) < 0) {
|
|
BN_free(dhg->g);
|
|
goto fail;
|
|
}
|
|
dhg->p = BN_new();
|
|
if (BN_hex2bn(&dhg->p, prime) < 0) {
|
|
BN_free(dhg->g);
|
|
BN_free(dhg->p);
|
|
goto fail;
|
|
}
|
|
|
|
return (1);
|
|
fail:
|
|
error("Bad prime description in line %d\n", linenum);
|
|
return (0);
|
|
}
|
|
|
|
DH *
|
|
choose_dh(int minbits)
|
|
{
|
|
FILE *f;
|
|
char line[1024];
|
|
int best, bestcount, which;
|
|
int linenum;
|
|
struct dhgroup dhg;
|
|
|
|
f = fopen(DH_PRIMES, "r");
|
|
if (!f) {
|
|
log("WARNING: %s does not exist, using old prime", DH_PRIMES);
|
|
return (dh_new_group1());
|
|
}
|
|
|
|
linenum = 0;
|
|
best = bestcount = 0;
|
|
while (fgets(line, sizeof(line), f)) {
|
|
linenum++;
|
|
if (!parse_prime(linenum, line, &dhg))
|
|
continue;
|
|
BN_free(dhg.g);
|
|
BN_free(dhg.p);
|
|
|
|
if ((dhg.size > minbits && dhg.size < best) ||
|
|
(dhg.size > best && best < minbits)) {
|
|
best = dhg.size;
|
|
bestcount = 0;
|
|
}
|
|
if (dhg.size == best)
|
|
bestcount++;
|
|
}
|
|
fclose (f);
|
|
|
|
if (bestcount == 0) {
|
|
log("WARNING: no primes in %s, using old prime", DH_PRIMES);
|
|
return (dh_new_group1());
|
|
}
|
|
|
|
f = fopen(DH_PRIMES, "r");
|
|
if (!f) {
|
|
fatal("WARNING: %s dissappeared, giving up", DH_PRIMES);
|
|
}
|
|
|
|
linenum = 0;
|
|
which = arc4random() % bestcount;
|
|
while (fgets(line, sizeof(line), f)) {
|
|
if (!parse_prime(linenum, line, &dhg))
|
|
continue;
|
|
if (dhg.size != best)
|
|
continue;
|
|
if (linenum++ != which) {
|
|
BN_free(dhg.g);
|
|
BN_free(dhg.p);
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
fclose(f);
|
|
|
|
return (dh_new_group(dhg.g, dhg.p));
|
|
}
|