/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-keygen

  • Committer: Teddy Hogeborn
  • Date: 2009-10-30 16:27:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091030162717-dun2a9li8bu6jm2w
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
            mandos-keygen, mandos-ctl, mandos.lsm): Add $(strip) to
                                                    make commands
                                                    easier to read
                                                    when run.
           (plugins.d/mandos-client): Use $(LINK.c) to compile in the
                                      same way as the other programs -
                                      i.e. not via an object file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
21
21
# Contact the authors at <mandos@fukt.bsnet.se>.
22
22
# 
23
23
 
24
 
VERSION="1.0.12"
 
24
VERSION="1.0.14"
25
25
 
26
26
KEYDIR="/etc/keys/mandos"
27
27
KEYTYPE=DSA
217
217
        %commit
218
218
        EOF
219
219
    
 
220
    if tty --quiet; then
 
221
        cat <<-EOF
 
222
        Note: Due to entropy requirements, key generation could take
 
223
        anything from a few minutes to SEVERAL HOURS.  Please be
 
224
        patient and/or supply the system with more entropy if needed.
 
225
        EOF
 
226
        echo -n "Started: "
 
227
        date
 
228
    fi
 
229
    
220
230
    # Generate a new key in the key rings
221
231
    gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
222
232
        --homedir "$RINGDIR" --trust-model always \
223
233
        --gen-key "$BATCHFILE"
224
234
    rm --force "$BATCHFILE"
225
235
    
 
236
    if tty --quiet; then
 
237
        echo -n "Finished: "
 
238
        date
 
239
    fi
 
240
    
226
241
    # Backup any old key files
227
242
    if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \
228
243
        2>/dev/null; then
263
278
    
264
279
    # Get fingerprint of key
265
280
    FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
266
 
        --enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \
 
281
        --enable-dsa2 --homedir '"'$RINGDIR'"' --trust-model always \
267
282
        --fingerprint --with-colons \
268
283
        | sed --quiet \
269
284
        --expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"