Pārlūkot izejas kodu

Option to supress creation of DH parama

Bob Mottram 10 gadus atpakaļ
vecāks
revīzija
2d2a4d122a
2 mainītis faili ar 10 papildinājumiem un 2 dzēšanām
  1. 8
    1
      src/freedombone-addcert
  2. 2
    1
      src/freedombone-clientcert

+ 8
- 1
src/freedombone-addcert Parādīt failu

35
 ORGANISATION="Freedombone"
35
 ORGANISATION="Freedombone"
36
 UNIT="Freedombone Unit"
36
 UNIT="Freedombone Unit"
37
 EXTENSIONS=""
37
 EXTENSIONS=""
38
+NODH=
38
 
39
 
39
 function show_help {
40
 function show_help {
40
     echo ''
41
     echo ''
50
     echo '  -l --location [locn]       Optional location name'
51
     echo '  -l --location [locn]       Optional location name'
51
     echo '  -o --organisation [name]   Optional organisation name'
52
     echo '  -o --organisation [name]   Optional organisation name'
52
     echo '  -u --unit [name]           Optional unit name'
53
     echo '  -u --unit [name]           Optional unit name'
54
+    echo '     --nodh                  Do not calculate DH params'
53
     echo '     --ca                    Certificate authority cert'
55
     echo '     --ca                    Certificate authority cert'
54
     echo ''
56
     echo ''
55
     exit 0
57
     exit 0
90
     --ca)
92
     --ca)
91
     EXTENSIONS="-extensions v3_ca"
93
     EXTENSIONS="-extensions v3_ca"
92
     ;;
94
     ;;
95
+    --nodh)
96
+    NODH="true"
97
+    ;;
93
     *)
98
     *)
94
     # unknown option
99
     # unknown option
95
     ;;
100
     ;;
108
 fi
113
 fi
109
 
114
 
110
 openssl req -x509 $EXTENSIONS -nodes -days 3650 -sha256 -subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$HOSTNAME" -newkey rsa:4096 -keyout /etc/ssl/private/$HOSTNAME.key -out /etc/ssl/certs/$HOSTNAME.crt
115
 openssl req -x509 $EXTENSIONS -nodes -days 3650 -sha256 -subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$HOSTNAME" -newkey rsa:4096 -keyout /etc/ssl/private/$HOSTNAME.key -out /etc/ssl/certs/$HOSTNAME.crt
111
-openssl dhparam -check -text -5 1024 -out /etc/ssl/certs/$HOSTNAME.dhparam
116
+if [ ! $NODH ]; then
117
+    openssl dhparam -check -text -5 1024 -out /etc/ssl/certs/$HOSTNAME.dhparam
118
+fi
112
 chmod 400 /etc/ssl/private/$HOSTNAME.key
119
 chmod 400 /etc/ssl/private/$HOSTNAME.key
113
 chmod 640 /etc/ssl/certs/$HOSTNAME.crt
120
 chmod 640 /etc/ssl/certs/$HOSTNAME.crt
114
 chmod 640 /etc/ssl/certs/$HOSTNAME.dhparam
121
 chmod 640 /etc/ssl/certs/$HOSTNAME.dhparam

+ 2
- 1
src/freedombone-clientcert Parādīt failu

98
 chmod 600 /etc/dovecot/passwd-file
98
 chmod 600 /etc/dovecot/passwd-file
99
 
99
 
100
 # create a user cert
100
 # create a user cert
101
-freedombone-addcert -h $USERNAME
101
+freedombone-addcert -h $USERNAME --nodh
102
 
102
 
103
 # create a certificate request
103
 # create a certificate request
104
 openssl req -new -sha256 -subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$USERNAME" -key /etc/ssl/private/$USERNAME.key -out /etc/ssl/requests/$USERNAME.csr
104
 openssl req -new -sha256 -subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$USERNAME" -key /etc/ssl/private/$USERNAME.key -out /etc/ssl/requests/$USERNAME.csr
108
 
108
 
109
 # move the cert to the user's home
109
 # move the cert to the user's home
110
 mkdir /home/$USERNAME/emailcert
110
 mkdir /home/$USERNAME/emailcert
111
+shred -zu /etc/ssl/certs/$USERNAME.dhparam
111
 mv /etc/ssl/certs/$USERNAME.cer /home/$USERNAME/emailcert
112
 mv /etc/ssl/certs/$USERNAME.cer /home/$USERNAME/emailcert
112
 cp /etc/ssl/certs/dovecot-ca.crt /home/$USERNAME/emailcert
113
 cp /etc/ssl/certs/dovecot-ca.crt /home/$USERNAME/emailcert
113
 mv /etc/ssl/private/$USERNAME.key /home/$USERNAME/emailcert
114
 mv /etc/ssl/private/$USERNAME.key /home/$USERNAME/emailcert