summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh-keygen.c3
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 47e97438b..097b08f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120030821
2 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/08/14 16:08:58
4 [ssh-keygen.c]
5 exit after primetest, ok djm@
6
120030813 720030813
2 - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge. 8 - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.
3 - (dtucker) OpenBSD CVS Sync 9 - (dtucker) OpenBSD CVS Sync
@@ -834,4 +840,4 @@
834 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 840 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
835 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 841 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
836 842
837$Id: ChangeLog,v 1.2893 2003/08/13 10:48:07 dtucker Exp $ 843$Id: ChangeLog,v 1.2894 2003/08/21 06:44:07 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index a6342b183..2ce5553f6 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.107 2003/07/28 09:49:56 djm Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.108 2003/08/14 16:08:58 markus Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -1009,6 +1009,7 @@ main(int ac, char **av)
1009 } 1009 }
1010 if (prime_test(in, out, trials, generator_wanted) != 0) 1010 if (prime_test(in, out, trials, generator_wanted) != 0)
1011 fatal("modulus screening failed\n"); 1011 fatal("modulus screening failed\n");
1012 return (0);
1012 } 1013 }
1013 1014
1014 arc4random_stir(); 1015 arc4random_stir();