/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: 2008-11-08 17:26:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081108172635-6eexzbysvsk4bu1z
* mandos: Also import "with_statement" and "absolute_import" from
          "__future__.  Import "closing" from "contextlib".
  (Client.__init__): Use "with closing" on "secfile".
  (Client.checker_callback): Call "self.bump_timeout()" instead of
                             doing it directly.
  (Client.bump_timeout): New method to bump up the timeout.
  (TCP_handler.handle): Simplify code to provide fallback default for
                        GnuTLS priority string.
  (IPv6_TCPServer): Do not inherit from
                    "SocketServer.ForkingTCPServer", since that is
                    undocumented - instead, follow the example code
                    from the documentation.
  (if_nametoindex): Use "with closing" on the socket.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
2
2
# 
3
3
# Mandos key generator - create a new OpenPGP key for a Mandos client
4
4
# 
5
 
# Copyright © 2008,2009 Teddy Hogeborn
6
 
# Copyright © 2008,2009 Björn Påhlsson
 
5
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
7
6
# 
8
7
# This program is free software: you can redistribute it and/or modify
9
8
# it under the terms of the GNU General Public License as published by
21
20
# Contact the authors at <mandos@fukt.bsnet.se>.
22
21
# 
23
22
 
24
 
VERSION="1.0.8"
 
23
VERSION="1.0.2"
25
24
 
26
25
KEYDIR="/etc/keys/mandos"
27
26
KEYTYPE=DSA
147
146
        echo "Invalid key length" >&2
148
147
        exit 1
149
148
    fi
150
 
    
 
149
 
151
150
    if [ -z "$KEYEXPIRE" ]; then
152
151
        echo "Empty key expiration" >&2
153
152
        exit 1
172
171
    if [ -n "$KEYEMAIL" ]; then
173
172
        KEYEMAILLINE="Name-Email: $KEYEMAIL"
174
173
    fi
175
 
    
 
174
 
176
175
    # Create temporary gpg batch file
177
176
    BATCHFILE="`mktemp -t mandos-keygen-batch.XXXXXXXXXX`"
178
177
fi
284
283
        stty echo
285
284
        if [ "$first" != "$second" ]; then
286
285
            echo -e "Passphrase mismatch" >&2
287
 
            touch "$RINGDIR"/mismatch
 
286
            false
288
287
        else
289
288
            echo -n "$first"
290
289
        fi
292
291
        --homedir "$RINGDIR" --trust-model always --armor --encrypt \
293
292
        --sign --recipient "$FINGERPRINT" --comment "$FILECOMMENT" \
294
293
        > "$SECFILE"
295
 
    if [ -e "$RINGDIR"/mismatch ]; then
296
 
        rm --force "$RINGDIR"/mismatch
297
 
        exit 1
 
294
    status="${PIPESTATUS[0]}"
 
295
    if [ "$status" -ne 0 ]; then
 
296
        exit "$status"
298
297
    fi
299
298
    
300
299
    cat <<-EOF