/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
1
#!/bin/sh -e
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
2
# 
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
3
# Mandos key generator - create a new OpenPGP key for a Mandos client
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
4
# 
237.7.174 by Teddy Hogeborn
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
5
# Copyright © 2008-2013 Teddy Hogeborn
6
# Copyright © 2008-2013 Björn Påhlsson
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
7
# 
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
12
#
13
#     This program is distributed in the hope that it will be useful,
14
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
15
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
#     GNU General Public License for more details.
17
# 
18
# You should have received a copy of the GNU General Public License
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
# 
237.11.2 by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout.
21
# Contact the authors at <mandos@recompile.se>.
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
22
# 
23
308 by Teddy Hogeborn
* Makefile (version): Changed to "1.3.2".
24
VERSION="1.6.3"
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
25
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
26
KEYDIR="/etc/keys/mandos"
237.7.169 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Update Linux documentation link.
27
KEYTYPE=RSA
28
KEYLENGTH=4096
29
SUBKEYTYPE=RSA
30
SUBKEYLENGTH=4096
196 by Teddy Hogeborn
* mandos-keygen (KEYNAME): Fall back to plain "hostname" if the
31
KEYNAME="`hostname --fqdn 2>/dev/null || hostname`"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
32
KEYEMAIL=""
237.7.179 by Teddy Hogeborn
* mandos (priority): Bug fix: Add even more magic to make the old
33
KEYCOMMENT=""
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
34
KEYEXPIRE=0
35
FORCE=no
36
KEYCOMMENT_ORIG="$KEYCOMMENT"
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
37
mode=keygen
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
38
179 by Teddy Hogeborn
* INSTALL: New file.
39
if [ ! -d "$KEYDIR" ]; then
40
    KEYDIR="/etc/mandos/keys"
41
fi
42
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
43
# Parse options
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
44
TEMP=`getopt --options vhpF:d:t:l:s:L:n:e:c:x:f \
45
    --longoptions version,help,password,passfile:,dir:,type:,length:,subtype:,sublength:,name:,email:,comment:,expire:,force \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
46
    --name "$0" -- "$@"`
47
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
48
help(){
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
49
basename="`basename $0`"
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
50
cat <<EOF
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
51
Usage: $basename [ -v | --version ]
52
       $basename [ -h | --help ]
53
   Key creation:
54
       $basename [ OPTIONS ]
55
   Encrypted password creation:
56
       $basename { -p | --password } [ --name NAME ] [ --dir DIR]
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
57
       $basename { -F | --passfile } FILE [ --name NAME ] [ --dir DIR]
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
58
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
59
Key creation options:
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
60
  -v, --version         Show program's version number and exit
61
  -h, --help            Show this help message and exit
62
  -d DIR, --dir DIR     Target directory for key files
237.7.169 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Update Linux documentation link.
63
  -t TYPE, --type TYPE  Key type.  Default is RSA.
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
64
  -l BITS, --length BITS
237.7.169 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Update Linux documentation link.
65
                        Key length in bits.  Default is 4096.
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
66
  -s TYPE, --subtype TYPE
237.7.175 by Teddy Hogeborn
* mandos-keygen: Bug fix: Specify key usage to avoid creating keys
67
                        Subkey type.  Default is RSA.
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
68
  -L BITS, --sublength BITS
237.7.169 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Update Linux documentation link.
69
                        Subkey length in bits.  Default is 4096.
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
70
  -n NAME, --name NAME  Name of key.  Default is the FQDN.
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
71
  -e ADDRESS, --email ADDRESS
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
72
                        Email address of key.  Default is empty.
123 by Teddy Hogeborn
* mandos-keygen: Minor help text change.
73
  -c TEXT, --comment TEXT
237.7.179 by Teddy Hogeborn
* mandos (priority): Bug fix: Add even more magic to make the old
74
                        Comment field for key.  The default is empty.
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
75
  -x TIME, --expire TIME
76
                        Key expire time.  Default is no expiration.
77
                        See gpg(1) for syntax.
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
78
  -f, --force           Force overwriting old key files.
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
79
80
Password creation options:
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
81
  -p, --password        Create an encrypted password using the key in
82
                        the key directory.  All options other than
83
                        --dir and --name are ignored.
84
  -F FILE, --passfile FILE
85
                        Encrypt a password from FILE using the key in
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
86
                        the key directory.  All options other than
123 by Teddy Hogeborn
* mandos-keygen: Minor help text change.
87
                        --dir and --name are ignored.
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
88
EOF
89
}
90
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
91
eval set -- "$TEMP"
92
while :; do
93
    case "$1" in
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
94
	-p|--password) mode=password; shift;;
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
95
	-F|--passfile) mode=password; PASSFILE="$2"; shift 2;;
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
96
	-d|--dir) KEYDIR="$2"; shift 2;;
97
	-t|--type) KEYTYPE="$2"; shift 2;;
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
98
	-s|--subtype) SUBKEYTYPE="$2"; shift 2;;
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
99
	-l|--length) KEYLENGTH="$2"; shift 2;;
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
100
	-L|--sublength) SUBKEYLENGTH="$2"; shift 2;;
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
101
	-n|--name) KEYNAME="$2"; shift 2;;
102
	-e|--email) KEYEMAIL="$2"; shift 2;;
103
	-c|--comment) KEYCOMMENT="$2"; shift 2;;
87 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages in "plugins.d".
104
	-x|--expire) KEYEXPIRE="$2"; shift 2;;
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
105
	-f|--force) FORCE=yes; shift;;
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
106
	-v|--version) echo "$0 $VERSION"; exit;;
107
	-h|--help) help; exit;;
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
108
	--) shift; break;;
109
	*) echo "Internal error" >&2; exit 1;;
110
    esac
111
done
112
if [ "$#" -gt 0 ]; then
113
    echo "Unknown arguments: '$@'" >&2
114
    exit 1
115
fi
116
117
SECKEYFILE="$KEYDIR/seckey.txt"
118
PUBKEYFILE="$KEYDIR/pubkey.txt"
119
120
# Check for some invalid values
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
121
if [ ! -d "$KEYDIR" ]; then
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
122
    echo "$KEYDIR not a directory" >&2
123
    exit 1
124
fi
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
125
if [ ! -r "$KEYDIR" ]; then
126
    echo "Directory $KEYDIR not readable" >&2
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
127
    exit 1
128
fi
129
130
if [ "$mode" = keygen ]; then
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
131
    if [ ! -w "$KEYDIR" ]; then
132
	echo "Directory $KEYDIR not writeable" >&2
133
	exit 1
134
    fi
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
135
    if [ -z "$KEYTYPE" ]; then
136
	echo "Empty key type" >&2
137
	exit 1
138
    fi
139
    
140
    if [ -z "$KEYNAME" ]; then
141
	echo "Empty key name" >&2
142
	exit 1
143
    fi
144
    
145
    if [ -z "$KEYLENGTH" ] || [ "$KEYLENGTH" -lt 512 ]; then
146
	echo "Invalid key length" >&2
147
	exit 1
148
    fi
237.2.37 by Teddy Hogeborn
* mandos-keygen (password): Remove bashism "${PIPESTATUS}".
149
    
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
150
    if [ -z "$KEYEXPIRE" ]; then
151
	echo "Empty key expiration" >&2
152
	exit 1
153
    fi
154
    
155
    # Make FORCE be 0 or 1
156
    case "$FORCE" in
157
	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) FORCE=1;;
158
	[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|*) FORCE=0;;
159
    esac
160
    
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
161
    if [ \( -e "$SECKEYFILE" -o -e "$PUBKEYFILE" \) \
162
	-a "$FORCE" -eq 0 ]; then
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
163
	echo "Refusing to overwrite old key files; use --force" >&2
164
	exit 1
165
    fi
166
    
167
    # Set lines for GnuPG batch file
168
    if [ -n "$KEYCOMMENT" ]; then
169
	KEYCOMMENTLINE="Name-Comment: $KEYCOMMENT"
170
    fi
171
    if [ -n "$KEYEMAIL" ]; then
172
	KEYEMAILLINE="Name-Email: $KEYEMAIL"
173
    fi
237.2.37 by Teddy Hogeborn
* mandos-keygen (password): Remove bashism "${PIPESTATUS}".
174
    
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
175
    # Create temporary gpg batch file
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
176
    BATCHFILE="`mktemp -t mandos-keygen-batch.XXXXXXXXXX`"
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
177
fi
178
179
if [ "$mode" = password ]; then
180
    # Create temporary encrypted password file
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
181
    SECFILE="`mktemp -t mandos-keygen-secfile.XXXXXXXXXX`"
182
fi
183
184
# Create temporary key ring directory
185
RINGDIR="`mktemp -d -t mandos-keygen-keyrings.XXXXXXXXXX`"
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
186
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
187
# Remove temporary files on exit
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
188
trap "
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
189
set +e; \
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
190
test -n \"$SECFILE\" && shred --remove \"$SECFILE\"; \
191
shred --remove \"$RINGDIR\"/sec*;
192
test -n \"$BATCHFILE\" && rm --force \"$BATCHFILE\"; \
193
rm --recursive --force \"$RINGDIR\";
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
194
tty --quiet && stty echo; \
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
195
" EXIT
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
196
237.2.215 by teddy at bsnet
* debian/control (Standards-Version): Updated to "3.9.1".
197
set -e
198
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
199
umask 077
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
200
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
201
if [ "$mode" = keygen ]; then
202
    # Create batch file for GnuPG
203
    cat >"$BATCHFILE" <<-EOF
204
	Key-Type: $KEYTYPE
205
	Key-Length: $KEYLENGTH
237.7.175 by Teddy Hogeborn
* mandos-keygen: Bug fix: Specify key usage to avoid creating keys
206
	Key-Usage: sign,auth
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
207
	Subkey-Type: $SUBKEYTYPE
208
	Subkey-Length: $SUBKEYLENGTH
237.7.175 by Teddy Hogeborn
* mandos-keygen: Bug fix: Specify key usage to avoid creating keys
209
	Subkey-Usage: encrypt
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
210
	Name-Real: $KEYNAME
211
	$KEYCOMMENTLINE
212
	$KEYEMAILLINE
213
	Expire-Date: $KEYEXPIRE
214
	#Preferences: <string>
215
	#Handle: <no-spaces>
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
216
	#%pubring pubring.gpg
217
	#%secring secring.gpg
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
218
	%commit
219
	EOF
220
    
237.2.156 by Teddy Hogeborn
* mandos-keygen (keygen): Warn about long key generation time.
221
    if tty --quiet; then
222
	cat <<-EOF
223
	Note: Due to entropy requirements, key generation could take
224
	anything from a few minutes to SEVERAL HOURS.  Please be
225
	patient and/or supply the system with more entropy if needed.
226
	EOF
227
	echo -n "Started: "
228
	date
229
    fi
230
    
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
231
    # Generate a new key in the key rings
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
232
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
233
	--homedir "$RINGDIR" --trust-model always \
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
234
	--gen-key "$BATCHFILE"
235
    rm --force "$BATCHFILE"
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
236
    
237.2.156 by Teddy Hogeborn
* mandos-keygen (keygen): Warn about long key generation time.
237
    if tty --quiet; then
238
	echo -n "Finished: "
239
	date
240
    fi
241
    
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
242
    # Backup any old key files
243
    if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \
244
	2>/dev/null; then
245
	shred --remove "$SECKEYFILE"
246
    fi
247
    if cp --backup=numbered --force "$PUBKEYFILE" "$PUBKEYFILE" \
248
	2>/dev/null; then
249
	rm --force "$PUBKEYFILE"
250
    fi
251
    
252
    FILECOMMENT="Mandos client key for $KEYNAME"
253
    if [ "$KEYCOMMENT" != "$KEYCOMMENT_ORIG" ]; then
254
	FILECOMMENT="$FILECOMMENT ($KEYCOMMENT)"
255
    fi
256
    
257
    if [ -n "$KEYEMAIL" ]; then
258
	FILECOMMENT="$FILECOMMENT <$KEYEMAIL>"
259
    fi
260
    
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
261
    # Export key from key rings to key files
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
262
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
263
	--homedir "$RINGDIR" --armor --export-options export-minimal \
264
	--comment "$FILECOMMENT" --output "$SECKEYFILE" \
265
	--export-secret-keys
266
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
267
	--homedir "$RINGDIR" --armor --export-options export-minimal \
268
	--comment "$FILECOMMENT" --output "$PUBKEYFILE" --export
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
269
fi
270
271
if [ "$mode" = password ]; then
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
272
    # Import key into temporary key rings
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
273
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
274
	--homedir "$RINGDIR" --trust-model always --armor \
275
	--import "$SECKEYFILE"
276
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
277
	--homedir "$RINGDIR" --trust-model always --armor \
278
	--import "$PUBKEYFILE"
279
    
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
280
    # Get fingerprint of key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
281
    FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
237.2.173 by Teddy Hogeborn
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
282
	--enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
283
	--fingerprint --with-colons \
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
284
	| sed --quiet \
285
	--expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
286
    
287
    test -n "$FINGERPRINT"
288
    
289
    FILECOMMENT="Encrypted password for a Mandos client"
290
    
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
291
    while [ ! -s "$SECFILE" ]; do
292
	if [ -n "$PASSFILE" ]; then
293
	    cat "$PASSFILE"
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
294
	else
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
295
	    tty --quiet && stty -echo
237.7.176 by Teddy Hogeborn
* Makefile (install-client-nokey): Install "mandos-change-keytype".
296
	    echo -n "Enter passphrase: " >&2
237.7.162 by Teddy Hogeborn
* mandos: Comment changes.
297
	    read first
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
298
	    tty --quiet && echo >&2
237.7.176 by Teddy Hogeborn
* Makefile (install-client-nokey): Install "mandos-change-keytype".
299
	    echo -n "Repeat passphrase: " >&2
237.7.162 by Teddy Hogeborn
* mandos: Comment changes.
300
	    read second
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
301
	    if tty --quiet; then
302
		echo >&2
303
		stty echo
304
	    fi
305
	    if [ "$first" != "$second" ]; then
306
		echo "Passphrase mismatch" >&2
307
		touch "$RINGDIR"/mismatch
308
	    else
309
		echo -n "$first"
310
	    fi
311
	fi | gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
312
	    --homedir "$RINGDIR" --trust-model always --armor \
313
	    --encrypt --sign --recipient "$FINGERPRINT" --comment \
314
	    "$FILECOMMENT" > "$SECFILE"
315
	if [ -e "$RINGDIR"/mismatch ]; then
316
	    rm --force "$RINGDIR"/mismatch
317
	    if tty --quiet; then
318
		> "$SECFILE"
319
	    else
320
		exit 1
321
	    fi
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
322
	fi
237.7.42 by Teddy Hogeborn
* mandos-keygen: Loop until passwords match when run interactively.
323
    done
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
324
    
325
    cat <<-EOF
326
	[$KEYNAME]
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
327
	host = $KEYNAME
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
328
	fingerprint = $FINGERPRINT
329
	secret =
198 by Teddy Hogeborn
* mandos-keygen: New "--passfile" option. Confirm entered password.
330
	EOF
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
331
    sed --quiet --expression='
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
332
	/^-----BEGIN PGP MESSAGE-----$/,/^-----END PGP MESSAGE-----$/{
333
	    /^$/,${
103 by Teddy Hogeborn
* mandos-keygen: Strip 24-bit checksum of Radix-64 from output to make
334
		# Remove 24-bit Radix-64 checksum
335
		s/=....$//
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
336
		# Indent four spaces
337
		/^[^-]/s/^/    /p
338
	    }
339
	}' < "$SECFILE"
340
fi
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
341
342
trap - EXIT
343
97 by Teddy Hogeborn
* mandos-keygen: Bug fix: Recognize new options --subtype and
344
set +e
345
# Remove the password file, if any
346
if [ -n "$SECFILE" ]; then
347
    shred --remove "$SECFILE"
348
fi
73 by Teddy Hogeborn
* Makefile (COVERAGE): Change back to "--coverage".
349
# Remove the key rings
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
350
shred --remove "$RINGDIR"/sec*
351
rm --recursive --force "$RINGDIR"