chiark
/
gitweb
/
~mdw
/
distorted-keys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shamir.in: Declare subcommands with decorator.
[distorted-keys]
/
ktype.gnupg
diff --git
a/ktype.gnupg
b/ktype.gnupg
index 8a8e764da7911e734da670d3571277cfb574f84b..c24492f1df8ee12f4308851c1ef432ef0179c13f 100644
(file)
--- a/
ktype.gnupg
+++ b/
ktype.gnupg
@@
-56,10
+56,9
@@
EOF
: ${kprop_realname=%{realname\}} ${kprop_email=%{email\}}
: ${kprop_comment=%{comment-nil\}}
: ${kprop_realname=%{realname\}} ${kprop_email=%{email\}}
: ${kprop_comment=%{comment-nil\}}
-
k_generate
() {
- base=$1
nub=$2
+
initdir
() {
+ base=$1
- makenub >"$nub"
prefs="$kprop_cipher_prefs $kprop_digest_prefs $kprop_compress_prefs"
case ${kprop_s2k_cipher+t} in
prefs="$kprop_cipher_prefs $kprop_digest_prefs $kprop_compress_prefs"
case ${kprop_s2k_cipher+t} in
@@
-87,6
+86,12
@@
personal-digest-preferences $kprop_digest_prefs
personal-compress-preferences $kprop_compress_prefs
default-preference-list $prefs
EOF
personal-compress-preferences $kprop_compress_prefs
default-preference-list $prefs
EOF
+}
+
+k_generate () {
+ base=$1 nub=$2
+
+ initdir "$base"
{ cat <<EOF
Key-Type: $kprop_main_type
{ cat <<EOF
Key-Type: $kprop_main_type
@@
-121,6
+126,15
@@
EOF
run_gnupg "$base" --export --armor --output="$base/pub"
}
run_gnupg "$base" --export --armor --output="$base/pub"
}
+k_import () {
+ base=$1
+
+ initdir "$base"
+ run_gnupg "$base" --import "$base/pub"
+ run_gnupg "$base" --fingerprint --with-colons | \
+ grep '^fpr:' | cut -d: -f10 >"$base/fpr"
+}
+
k_encrypt () {
base=$1
run_gnupg "$base" --encrypt --armor --recipient=$(cat "$base/fpr")
k_encrypt () {
base=$1
run_gnupg "$base" --encrypt --armor --recipient=$(cat "$base/fpr")