/mandos/trunk : revision 442

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: 2010-09-26 17:36:30 UTC
Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7

* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

Show diffs side-by-side

added added

removed removed

mandos-keygen

278

279

# Get fingerprint of key

280

FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \

281

--enable-dsa2 --homedir '"'$RINGDIR'"' --trust-model always \

281

--enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \

282

--fingerprint --with-colons \

283

| sed --quiet \

284

--expression='/^fpr:/{s/^fpr:.*:\$[0-9A-Z]*\$:\$/\\1/p;q}'`"

293

stty -echo

294

echo -n "Enter passphrase: " >&2

295

first="$(head --lines=1 | tr --delete '\n')"

296

echo -n -e "\nRepeat passphrase: " >&2

296

echo >&2

297

echo -n "Repeat passphrase: " >&2

297

298

second="$(head --lines=1 | tr --delete '\n')"

298

299

echo >&2

299

300

stty echo

300

301

if [ "$first" != "$second" ]; then

301

echo -e "Passphrase mismatch" >&2

302

echo "Passphrase mismatch" >&2

302

303

touch "$RINGDIR"/mismatch

303

304

else

304

305

echo -n "$first"

Older »