improve error message on rnd(4) failure. the old text made reference
to ssl(4), which is openssl specific (talks about plugin RSA library).
This commit is contained in:
parent
9e47af8814
commit
37a8d23037
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kex.c,v 1.1.1.1 2000/09/28 22:10:03 thorpej Exp $ */
|
||||
/* $NetBSD: kex.c,v 1.2 2000/10/04 03:43:57 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: kex.c,v 1.1.1.1 2000/09/28 22:10:03 thorpej Exp $");
|
||||
__RCSID("$NetBSD: kex.c,v 1.2 2000/10/04 03:43:57 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include "includes.h"
|
||||
|
@ -179,7 +179,7 @@ dh_new_group1()
|
|||
BN_set_word(dh->g, 2);
|
||||
do {
|
||||
if (DH_generate_key(dh) == 0)
|
||||
fatal("DH_generate_key");
|
||||
fatal("failed to generate DH key: rnd(4) is mandatory.");
|
||||
if (tries++ > 10)
|
||||
fatal("dh_new_group1: too many bad keys: giving up");
|
||||
} while (!dh_pub_is_valid(dh, dh->pub_key));
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ssh-add.c,v 1.1.1.1 2000/09/28 22:10:26 thorpej Exp $ */
|
||||
/* $NetBSD: ssh-add.c,v 1.2 2000/10/04 03:43:58 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: ssh-add.c,v 1.1.1.1 2000/09/28 22:10:26 thorpej Exp $");
|
||||
__RCSID("$NetBSD: ssh-add.c,v 1.2 2000/10/04 03:43:58 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include "includes.h"
|
||||
|
@ -260,7 +260,7 @@ main(int argc, char **argv)
|
|||
extern char *__progname;
|
||||
|
||||
fprintf(stderr,
|
||||
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
|
||||
"%s: failed to generate RSA key: rnd(4) is mandatory.\n",
|
||||
__progname);
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ssh-agent.c,v 1.1.1.1 2000/09/28 22:10:29 thorpej Exp $ */
|
||||
/* $NetBSD: ssh-agent.c,v 1.2 2000/10/04 03:43:58 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: ssh-agent.c,v 1.1.1.1 2000/09/28 22:10:29 thorpej Exp $");
|
||||
__RCSID("$NetBSD: ssh-agent.c,v 1.2 2000/10/04 03:43:58 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include "includes.h"
|
||||
|
@ -673,7 +673,7 @@ main(int ac, char **av)
|
|||
/* check if RSA support exists */
|
||||
if (rsa_alive() == 0) {
|
||||
fprintf(stderr,
|
||||
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
|
||||
"%s: failed to generate RSA key: rnd(4) is mandatory.\n",
|
||||
__progname);
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ssh-keygen.c,v 1.1.1.1 2000/09/28 22:10:30 thorpej Exp $ */
|
||||
/* $NetBSD: ssh-keygen.c,v 1.2 2000/10/04 03:43:58 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: ssh-keygen.c,v 1.1.1.1 2000/09/28 22:10:30 thorpej Exp $");
|
||||
__RCSID("$NetBSD: ssh-keygen.c,v 1.2 2000/10/04 03:43:58 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include "includes.h"
|
||||
|
@ -620,7 +620,7 @@ main(int ac, char **av)
|
|||
/* check if RSA support is needed and exists */
|
||||
if (dsa_mode == 0 && rsa_alive() == 0) {
|
||||
fprintf(stderr,
|
||||
"%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
|
||||
"%s: failed to generate RSA key: rnd(4) is mandatory.\n",
|
||||
__progname);
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ssh.c,v 1.1.1.1 2000/09/28 22:10:34 thorpej Exp $ */
|
||||
/* $NetBSD: ssh.c,v 1.2 2000/10/04 03:43:58 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
|
@ -44,7 +44,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: ssh.c,v 1.1.1.1 2000/09/28 22:10:34 thorpej Exp $");
|
||||
__RCSID("$NetBSD: ssh.c,v 1.2 2000/10/04 03:43:58 itojun Exp $");
|
||||
#endif
|
||||
|
||||
#include "includes.h"
|
||||
|
@ -549,7 +549,7 @@ main(int ac, char **av)
|
|||
/* check if RSA support exists */
|
||||
if ((options.protocol & SSH_PROTO_1) &&
|
||||
rsa_alive() == 0) {
|
||||
log("%s: no RSA support in libssl and libcrypto. See ssl(8).",
|
||||
log("%s: failed to generate RSA key: rnd(4) is mandatory.\n",
|
||||
__progname);
|
||||
log("Disabling protocol version 1");
|
||||
options.protocol &= ~ (SSH_PROTO_1|SSH_PROTO_1_PREFERRED);
|
||||
|
|
Loading…
Reference in New Issue