From c103a908b9abcc6b96600e197a19249870aae0e5 Mon Sep 17 00:00:00 2001
From: sthen <>
Date: Wed, 8 Jul 2015 16:37:25 +0000
Subject: switch "openssl dhparam" default from 512 to 2048 bits, ok jsing@

---
 src/usr.bin/openssl/dhparam.c | 6 +++---
 src/usr.bin/openssl/openssl.1 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/dhparam.c b/src/usr.bin/openssl/dhparam.c
index 468fa00419..005ed25877 100644
--- a/src/usr.bin/openssl/dhparam.c
+++ b/src/usr.bin/openssl/dhparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: dhparam.c,v 1.3 2015/07/08 16:37:25 sthen Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -129,7 +129,7 @@
 
 #include <openssl/dsa.h>
 
-#define DEFBITS	512
+#define DEFBITS	2048
 
 /* -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
@@ -227,7 +227,7 @@ bad:
 		BIO_printf(bio_err, " -C            Output C code\n");
 		BIO_printf(bio_err, " -2            generate parameters using  2 as the generator value\n");
 		BIO_printf(bio_err, " -5            generate parameters using  5 as the generator value\n");
-		BIO_printf(bio_err, " numbits       number of bits in to generate (default 512)\n");
+		BIO_printf(bio_err, " numbits       number of bits in to generate (default 2048)\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, " -engine e     use engine e, possibly a hardware device.\n");
 #endif
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 5106943640..ecf2eda2ea 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.15 2015/06/20 01:07:25 doug Exp $
+.\" $OpenBSD: openssl.1,v 1.16 2015/07/08 16:37:25 sthen Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: June 20 2015 $
+.Dd $Mdocdate: July 8 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -2043,7 +2043,7 @@ This option inhibits the output of the encoded version of the parameters.
 This argument specifies that a parameter set should be generated of size
 .Ar numbits .
 It must be the last option.
-If not present, a value of 512 is used.
+If not present, a value of 2048 is used.
 If this value is present, the input file is ignored and
 parameters are generated instead.
 .It Fl out Ar file
-- 
cgit v1.2.3-55-g6feb