switch from "email" to "e-mail"

diff --git a/Changelog b/Changelog
index 2c9dc9b743695ecabfd5785b4a55b4e9f7f87689..ef7c793e449842e965fc4dcdb66bd15c8e6d70cd 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 msva-perl (0.9~pre) upstream;
 
-  * Add "email" context (checks for 's' capability) (closes MS #2688)
+  * Add "e-mail" context (checks for signing capability instead of
+    authentication) (closes MS #2688)
   * Add "openpgp4fpr" pkc type for providing OpenPGP v4 fingerprint
   * Add --version option to msva-query-agent
 

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index e377808c2c6cc6ead71f26d6e15180a111d332fc..ed72f4dda43770f8e45f6d3031260a41a345da97 100755 (executable)
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -650,7 +650,7 @@
                };
 
     # check context string
-    if ($data->{context} =~ /^(https|ssh|smtp|ike|postgresql|imaps|imap|submission|email)$/) {
+    if ($data->{context} =~ /^(https|ssh|smtp|ike|postgresql|imaps|imap|submission|e-mail)$/) {
        $data->{context} = $1;
     } else {
        msvalog('error', "invalid context: %s\n", $data->{context});
@@ -676,7 +676,7 @@
     }
 
     my $prefix = $data->{context}.'://';
-    if ($data->{context} eq 'email' ||
+    if ($data->{context} eq 'e-mail' ||
        (defined $data->{peer}->{type} &&
         $data->{peer}->{type} eq 'client' &&
         # ike and smtp clients are effectively other servers, so we'll
@@ -782,7 +782,7 @@
          if ($primarymatch) {
            my $iscapable = 0;
            msvalog('verbose', "key 0x%s matches...\n",$subkey->hex_id);
-           if ($data->{context} eq 'email') {
+           if ($data->{context} eq 'e-mail') {
              if ($subkey->usage_flags =~ /s/) {
                $iscapable = 1;
                msvalog('verbose', "...and is signing-capable...\n");

diff --git a/tests/basic b/tests/basic
index 371f20883a41a411a5b9395e5b1e2fa7dcc72467..5cc272378b4c23f8d05eb869eaefccde1867c444 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -113,8 +113,8 @@ runtests() {
     # X should now validate as X
         "${srcdir}"/test-msva msva-perl "${srcdir}"/test-msva msva-query-agent https x.example.net "${ctype}" < "${WORKDIR}/pkc/x.${ctype}"
         "${srcdir}"/test-msva msva-perl "${srcdir}"/test-msva msva-query-agent https 'a <a@example.net>' "${ctype}" client < "${WORKDIR}/pkc/a.${ctype}"
-       # also test "email" context
-        "${srcdir}"/test-msva msva-perl "${srcdir}"/test-msva msva-query-agent email 'a <a@example.net>' "${ctype}" < "${WORKDIR}/pkc/a.${ctype}"
+       # also test "e-mail" context
+        "${srcdir}"/test-msva msva-perl "${srcdir}"/test-msva msva-query-agent e-mail 'a <a@example.net>' "${ctype}" < "${WORKDIR}/pkc/a.${ctype}"
         
     # but X should not validate as Y or Z:
         for name in x y z; do