/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:
20
20
# Contact the authors at <mandos@fukt.bsnet.se>.
21
21
22
22
 
23
 
VERSION="1.0"
 
23
VERSION="1.0.2"
24
24
 
25
25
KEYDIR="/etc/keys/mandos"
26
26
KEYTYPE=DSA
289
289
        fi
290
290
    fi | gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
291
291
        --homedir "$RINGDIR" --trust-model always --armor --encrypt \
292
 
        --recipient "$FINGERPRINT" --comment "$FILECOMMENT" \
 
292
        --sign --recipient "$FINGERPRINT" --comment "$FILECOMMENT" \
293
293
        > "$SECFILE"
294
294
    status="${PIPESTATUS[0]}"
295
295
    if [ "$status" -ne 0 ]; then