/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-08-14 21:03:26 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080814210326-u58d7rj78g3i0ed4
* plugins.d/password-request.c (init_gnutls_global): Renamed
                               "pubkeyfile" to "pubkeyfilename" and
                               "seckeyfile" to "seckeyfilename".
  (combinepath): Changed to use asprintf instead of malloc and memcpy.

  (main): Renamed "pubkeyfile" to "pubkeyname", renamed "seckeyfile"
          to "seckeyname" and created new non-const variables
          "pubkeyfilename" and "seckeyfilename".

* mandos (AvahiService.__init__): Bug fix: initialize
                                  "self.max_renames".
  (AvahiService.rename): Bug fix: use "self.name" instead of "name".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen
70
70
        -n|--name) KEYNAME="$2"; shift 2;;
71
71
        -e|--email) KEYEMAIL="$2"; shift 2;;
72
72
        -c|--comment) KEYCOMMENT="$2"; shift 2;;
73
 
        -x|--expire) KEYEXPIRE="$2"; shift 2;;
 
73
        -x|--expire) KEYCOMMENT="$2"; shift 2;;
74
74
        -f|--force) FORCE=yes; shift;;
75
75
        -v|--version) echo "$0 $VERSION"; exit;;
76
76
        -h|--help) help; exit;;
142
142
PUBRING="`mktemp -t mandos-gpg-pubring.XXXXXXXXXX`"
143
143
 
144
144
# Remove temporary files on exit
145
 
trap "
146
 
set +e
147
 
rm --force $PUBRING $BATCHFILE;
148
 
shred --remove $SECRING;
149
 
stty echo
150
 
" EXIT
 
145
trap "rm --force $PUBRING $BATCHFILE; shred --remove $SECRING" EXIT
151
146
 
152
147
# Create batch file for GnuPG
153
148
cat >"$BATCHFILE" <<EOF
193
188
 
194
189
# Export keys from key rings to key files
195
190
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
196
 
    --no-default-keyring --no-options --secret-keyring "$SECRING" \
 
191
    --no-default-keyring --secret-keyring "$SECRING" \
197
192
    --keyring "$PUBRING" --export-options export-minimal \
198
193
    --comment "$FILECOMMENT" --output "$SECKEYFILE" \
199
194
    --export-secret-keys
200
195
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
201
 
    --no-default-keyring --no-options --secret-keyring "$SECRING" \
 
196
    --no-default-keyring --secret-keyring "$SECRING" \
202
197
    --keyring "$PUBRING" --export-options export-minimal \
203
198
    --comment "$FILECOMMENT" --output "$PUBKEYFILE" \
204
199
    --export