/mandos/trunk : revision 237.2.33

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 at bsnet
Date: 2010-08-10 19:08:24 UTC
mto: This revision was merged to the branch mainline in revision 419.
Revision ID: teddy@fukt.bsnet.se-20100810190824-5yquozxy4kh6py3f

* plugins.d/mandos-client.c: An empty interface name now means to
                             autodetect an interface; to specify no
                             particular interface, use "none".
  (sys_class_net): New global variable for the "/sys/class/net" path.
  (good_interface): New function to determine the suitability of an
                    interface.  Used by a scandir() call in main().
  (main): Changed default value for "interface" to the empty string.
          Moved "connect_to" to be a global variable.  Only take down
          and up interface if its name is not "none".
* plugins.d/mandos-client.xml (OPTIONS): Update documentation for the
                                         "--interface" option.

Show diffs side-by-side

added added

removed removed

mandos-keygen

217

%commit

218

EOF

219

220

if tty --quiet; then

221

cat <<-EOF

222

Note: Due to entropy requirements, key generation could take

223

anything from a few minutes to SEVERAL HOURS. Please be

224

patient and/or supply the system with more entropy if needed.

225

EOF

226

echo -n "Started: "

227

date

228

229

230

220

# Generate a new key in the key rings

231

221

gpg --quiet --batch --no-tty --no-options --enable-dsa2 \

232

222

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

233

223

--gen-key "$BATCHFILE"

234

224

rm --force "$BATCHFILE"

235

225

236

if tty --quiet; then

237

echo -n "Finished: "

238

date

239

240

241

226

# Backup any old key files

242

227

if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \

243

228

2>/dev/null; then

Older »