From 5affb786eac440efb5fc26255ef35e87288b5e7b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 15 Aug 2015 09:10:00 +0100
Subject: [PATCH] Option to set DH key length

---
 man/freedombone-addcert.1.gz | Bin 552 -> 580 bytes
 src/freedombone-addcert      |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/man/freedombone-addcert.1.gz b/man/freedombone-addcert.1.gz
index ad66eaca754ade3fe8c8299a74a38f2c8a1ecacc..1fb9de8655b7251b0a510d8d1240d9e54c34f0ab 100644
GIT binary patch
literal 580
zcmV-K0=xYmiwFRc^UhTO1BFsiZ__{we!pK~<pq#PLN_6e3L)C9v=i%EEiDMj9xfLr
zIW0Ly=gXk~o=a&3Q!)|dA+bMy{yy8$W&ycH%&1PuU?{Upp>;5V;Cuv2Y2ob6=xqRj
ze?R@j!Isg!U=J{@tO6mTWC6kLWH}4O5Z#XuCcw(-#z9UNltt;ZDS)xcL)L}C3_7IF
zwUQ1Q$iNk*TACww^6hrDPOg(-{;-5yN$iZQ@g712J4LN=b`OfOE+SzkeNX>Y!LB0T
zLzD4;1Us^YG@4J57Iv-C&VPkj`G9*5M^m^Gw1HGR?h=MF-_Y3><6KsZ_eYUev*hyb
zdcC<`-3H>a^XQ$(=S&_Z;Yx%;Kcaz?{^&@yO(t_c&dt8@=n7hv1%l?W5a6HxPC<xO
z(^-;LwTC^mpripWmVg^nI^TmY(|-`qNb74HT0V83Zs&g1ci508PTRu!a3Y#Q>0HC(
zI4-m++cZ*C$EoDfs`wv8v1V?OPpg~FU~-eJo~-WW=+)~dCRC--xXwo}<%MD`bv2Zz
zG!GX1s+;DS9{n(xTo=8tUl`fG(8gk)*<wwukF{v<XE<oe*2A7`J!r|+gN_(gFXqp8
zSb4_~Hj>$Aj=Py`H;dI>Af}YUlAQBr0Pj;uKUzx3X~j|d5IOoFqST7@d>zl%^D)dO
z?=H?}=NE_QRJ$6vyUsC8m*JWE+Lrb7@k^H5MR`NtHyJmV51&zQ$ZnC7n?u!COvi^~
S^0)M~m-r1bq1v021ONb%KPI36

literal 552
zcmV+@0@wW?iwFP+kAYPH1BFuGZ__Xke)nH-$_pTolx{*A6+*OIX(!sXT3RM3dvKgf
zVlDASK4+u<Jx*x_Q!)|dAvu5d{qSA1nL}m~Q>qd&7|JwNXdMh8I3L1NS~z<*d>=sI
z-!Ff0uw}Hb*aJ)>%Rq=Io<ndmUQPqiNB1*?F|e|_c94+;Wl=h9a$qd8kacb_g%+tZ
zt)xQ+GH`{7mgdMEf4^C+<LkJeKP+HZ5IZ9)yoXT1PEli=-GidEtw`8Ouj#)^*p=ip
zG#UR#up^sGqxn>6VAmM!?vJ`x)A;iCdcC<`-2~#Ywe8KxmwX?>xdI{Ak7(dzDLRsE
z<MGVj&}LtIbO{a196|F)2=LE;g9)*!TbHsd_pql1lr$hqCg2*C&i3Hj^dAJ&()u2U
zmQU)F?aW`_E!O0TlP32$oQNh+I9Ky%Fvztlnj}(G4HC(PRfB&V4K#Cue455|3gbn*
zdNz&M!#8iAg;1qN<JugZBX1Ndsms2DQgd&^ud1$J(CC)QWIFGZ{lLg}jn)>s%oZzh
zU93fePhoE;TlHtMRc|C)^(JCeotodse&;PiSW9Mqa-7Y0yP2<U12LflmgJmY1NfLw
z^4U^CPAiU@hse<<5hYfvXY0XiJsZJv{NdtkdVX=JPPD6#+wB~|WEq~RyQZinkKfYF
q&Wi>8*rZ%vK72*JA-hG67l*DpOh$)g^1Jk0OZ)~U0UBaw1ONbnm<lHV

diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index ebc00385..e4093a8b 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -36,6 +36,7 @@ ORGANISATION="Freedombone"
 UNIT="Freedombone Unit"
 EXTENSIONS=""
 NODH=
+DH_KEYLENGTH=1024
 
 function show_help {
     echo ''
@@ -51,6 +52,7 @@ function show_help {
     echo '  -l --location [locn]       Optional location name'
     echo '  -o --organisation [name]   Optional organisation name'
     echo '  -u --unit [name]           Optional unit name'
+    echo '     --dhkey [bits]          DH key length in bits'
     echo '     --nodh ""               Do not calculate DH params'
     echo '     --ca ""                 Certificate authority cert'
     echo ''
@@ -98,6 +100,10 @@ case $key in
     shift
     NODH="true"
     ;;
+    --dhkey)
+    shift
+    DH_KEYLENGTH=${1}
+    ;;
     *)
     # unknown option
     ;;
@@ -125,7 +131,7 @@ openssl req -x509 $EXTENSIONS -nodes -days 3650 -sha256 \
         -newkey rsa:4096 -keyout /etc/ssl/private/$CERTFILE.key \
         -out /etc/ssl/certs/$CERTFILE.crt
 if [ ! $NODH ]; then
-    openssl dhparam -check -text -5 1024 -out /etc/ssl/certs/$CERTFILE.dhparam
+    openssl dhparam -check -text -5 $DH_KEYLENGTH -out /etc/ssl/certs/$CERTFILE.dhparam
 fi
 chmod 400 /etc/ssl/private/$CERTFILE.key
 chmod 640 /etc/ssl/certs/$CERTFILE.crt