/mandos/release : revision 237.2.172

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-keygen

Committer: Teddy Hogeborn
Date: 2009-11-15 10:12:09 UTC
mto: (24.1.146 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 270.
Revision ID: teddy@fukt.bsnet.se-20091115101209-d0zrfwkp6u0l7v7b

* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

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 >&2

297

echo -n "Repeat passphrase: " >&2

296

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

298

297

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

299

298

echo >&2

300

299

stty echo

301

300

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

302

echo "Passphrase mismatch" >&2

301

echo -e "Passphrase mismatch" >&2

303

302

touch "$RINGDIR"/mismatch

304

303

else

305

304

echo -n "$first"

Older »