Removed support for Encrypted: headers, which were removed in RFC 2822.

This is a relict from RFC 822.

diff --git a/etc/scan.MMDDYY b/etc/scan.MMDDYY
index 942ddcc31c8559f00b08101268c1ff99e2a7501f..6d83b643a8e7ab1bec9d8180a7c7af6752755dbf 100644 (file)
--- a/etc/scan.MMDDYY
+++ b/etc/scan.MMDDYY
@@ -3,7 +3,7 @@
 %; Like scan.default, but the date is printed in MM/DD/YY format rather than
 %; MM/DD.
 %;
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})/%(void(year{date}))%02(modulo 100)%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  \

diff --git a/etc/scan.YYYYMMDD b/etc/scan.YYYYMMDD
index e91bcb1ee1f9716091fb4e43765db5371e913e80..efe63d3c71d30daf188618f07199d9925038f907 100644 (file)
--- a/etc/scan.YYYYMMDD
+++ b/etc/scan.YYYYMMDD
@@ -3,7 +3,7 @@
 %; Like scan.default, but the date is printed in YYYY-MM-DD format rather than
 %; MM/DD.
 %;
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %4(year{date})-%02(mon{date})-%02(mday{date})%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  \

diff --git a/etc/scan.mailx b/etc/scan.mailx
index 27d18d324638c4766de4679c40edf935b540b9ed..4f00a3cc3cbd6fc59fd879c25dafed0bd69bbb06 100644 (file)
--- a/etc/scan.mailx
+++ b/etc/scan.mailx
@@ -1,6 +1,6 @@
 %<(cur)>%| %>\
 %<{status} %|N%>\
-%<{replied}R%?{encrypted}E%| %>\
+%<{replied}R%| %>\
 %4(msg) \
 %<(mymbox{from})%<{to}To: %13(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%> \

diff --git a/etc/scan.nmh b/etc/scan.nmh
index b15a28157f2f9ee87b55e313833a337e79d9f1e7..019bc3ee8ad6de5a5b35aedf329c3aeb95f8adfb 100644 (file)
--- a/etc/scan.nmh
+++ b/etc/scan.nmh
@@ -2,7 +2,7 @@
 %;
 %; This is nmh's default format string (for non-UK sites).
 %;
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  \

diff --git a/etc/scan.nomime b/etc/scan.nomime
index 145e73f8e8313863a4ffee420f9849ac2eb73841..c6ead71dc2e930c1e934ab65f79383f61135876b 100644 (file)
--- a/etc/scan.nomime
+++ b/etc/scan.nomime
@@ -4,7 +4,7 @@
 %; format for scan, that doesn't do any RFC-2047 decoding of
 %; header components.
 %;
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%>  \
 %{subject}

diff --git a/etc/scan.size b/etc/scan.size
index 5f35b36507692948deaef3df4136759a3edcd675..d595f7aacb5a4de6ca66b83a3a1481b4957891c3 100644 (file)
--- a/etc/scan.size
+++ b/etc/scan.size
@@ -1,4 +1,4 @@
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %5(size) \
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\

diff --git a/etc/scan.time b/etc/scan.time
index 4c5813374036150983f919b45fd635f7c0f13349..99df6663cf3e9b2d53c2ee74b5e844024979bd03 100644 (file)
--- a/etc/scan.time
+++ b/etc/scan.time
@@ -1,4 +1,4 @@
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date}) \
 %02(hour{date}):%02(min{date})%3(tzone{date})\
 %<{date} %|*%>\

diff --git a/etc/scan.timely b/etc/scan.timely
index 54f6d0a2d6753b59e5aebc32861e3116bf294758..d8e07bedbd81c26b4ea9c9a189060fc24f6a78d6 100644 (file)
--- a/etc/scan.timely
+++ b/etc/scan.timely
@@ -1,4 +1,4 @@
-%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %(void(rclock{date}))\
 %<(gt 15768000)%03(month{date})%(void(year{date}))%02(modulo 100)\
 %?(gt 604800)%02(mday{date})%03(month{date})\

diff --git a/etc/scan.unseen b/etc/scan.unseen
index 2cd0b820a5e78835559e36888b981c44794437c5..ba1fee32da1a84215c80a0bebc3ac232180b8c76 100644 (file)
--- a/etc/scan.unseen
+++ b/etc/scan.unseen
@@ -1,4 +1,4 @@
-%4(msg)%<(cur)+%| %>%<(unseen)U%| %>%<{replied}-%?{encrypted}E%| %>\
+%4(msg)%<(cur)+%| %>%<(unseen)U%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  \

diff --git a/h/scansbr.h b/h/scansbr.h
index bf2e88f878c013750079567d906411baa31a4d8f..b07feef03e24e7dbfd9213b162bb80755b152f9c 100644 (file)
--- a/h/scansbr.h
+++ b/h/scansbr.h
@@ -4,7 +4,6 @@
 
 extern char *scanl;
 
-#define SCNENC  2     /* message just fine, but encrypted(!!) */
 #define SCNMSG  1     /* message just fine                    */
 #define SCNEOF  0     /* empty message                        */
 #define SCNERR  (-1)  /* error message                        */
@@ -15,7 +14,7 @@ extern char *scanl;
 ** default format for `scan' and `inc'
 */
 # define FORMAT \
-"=%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
+"=%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %4(year{date})-%02(mon{date})-%02(mday{date})  \
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  %(decode{subject})\n"

diff --git a/man/mh-format.man5 b/man/mh-format.man5
index dccedad67665acd178d6597721f2bc5eb939aec1..b292586206d94523664704e5b77a38c46884660c 100644 (file)
--- a/man/mh-format.man5
+++ b/man/mh-format.man5
@@ -399,15 +399,14 @@ The first part is:
 .PP
 .RS
 .nf
-%4(msg)%<(cur)+%| %>%<{replied}\-%?{encrypted}E%| %>
+%4(msg)%<(cur)+%| %>%<{replied}\-%| %>
 .fi
 .RE
 .PP
 which says that the message number should be printed in four digits.
 If the message is the current message then a `+' else a space should
 be printed; if a \*(lqReplied:\*(rq field is present then a `\-'
-else if an \*(lqEncrypted:\*(rq field is present then an `E' otherwise
-a space should be printed.  Next:
+else a space should be printed.  Next:
 .PP
 .RS
 .nf

diff --git a/uip/inc.c b/uip/inc.c
index b48c9ea6a001a2b5f632dd4221cf793c5673a215..04572c0ba31125116ace0def8a31b6faff762bdf 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -412,7 +412,6 @@ main(int argc, char **argv)
                        break;
 
                case SCNMSG:
-               case SCNENC:
                        /*
                        **  Run the external program hook on the message.
                        */

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index aa95dd8ad7f6a0287cdb5f90b32a9c5cf4d0ece2..6a0cf0497f7ac1aaa7e18d5347fd9b89a6a29c54 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -825,7 +825,7 @@ losing:
                                break;
 
                        default:
-                               if (!uprf(buffer, XXX_FIELD_PRF) && !uprf(buffer, VRSN_FIELD) && !uprf(buffer, "Subject:") && !uprf(buffer, "Encrypted:") && !uprf(buffer, "Message-ID:")) {
+                               if (!uprf(buffer, XXX_FIELD_PRF) && !uprf(buffer, VRSN_FIELD) && !uprf(buffer, "Subject:") && !uprf(buffer, "Message-ID:")) {
                                        filterstate = -1;
                                        buffer[0] = 0;
                                        break;
@@ -1063,7 +1063,6 @@ copy_some_headers(FILE *out, CT ct)
                if (!uprf(hp->name, XXX_FIELD_PRF) &&
                                mh_strcasecmp(hp->name, VRSN_FIELD) &&
                                mh_strcasecmp(hp->name, "Subject") &&
-                               mh_strcasecmp(hp->name, "Encrypted") &&
                                mh_strcasecmp(hp->name, "Message-ID"))
                        fprintf(out, "%s:%s", hp->name, hp->value);
                hp = hp->next;  /* next header field */

diff --git a/uip/scan.c b/uip/scan.c
index d5cc50f94f25b410adbd25e39efb880ad5b04744..152055369a6b65009acbf7e9516fc1bd2534237f 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -129,7 +129,7 @@ main(int argc, char **argv)
                for (msgnum = 1; ; ++msgnum) {
                        state = scan(in, msgnum, -1, nfs, width, 0, 0,
                                        NULL, 0L, 1);
-                       if (state != SCNMSG && state != SCNENC)
+                       if (state != SCNMSG)
                                break;
                }
                fclose(in);
@@ -210,7 +210,6 @@ main(int argc, char **argv)
                                                msgnum == mp->curmsg, unseen,
                                                folder, 0L, 1)) {
                        case SCNMSG:
-                       case SCNENC:
                        case SCNERR:
                                break;
 

diff --git a/uip/scansbr.c b/uip/scansbr.c
index a43044c8a637b76264afd89969569069ff0d5527..4b712432cec19d13c833f0fd62e7578557e92d89 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -71,7 +71,7 @@ int
 scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        int unseen, char *folder, long size, int noisy)
 {
-       int i, compnum, encrypted, state;
+       int i, compnum, state;
        unsigned char *cp, *tmpbuf;
        char **nxtbuf;
        char *saved_c_text = NULL;
@@ -109,14 +109,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                FINDCOMP(cptr, "folder");
                if (cptr && folder)
                        cptr->c_text = folder;
-               FINDCOMP(cptr, "encrypted");
-               if (!cptr)
-                       if ((cptr = (struct comp *)calloc(1, sizeof(*cptr)))) {
-                               cptr->c_name = "encrypted";
-                               cptr->c_next = wantcomp[i = CHASH(cptr->c_name)];
-                               wantcomp[i] = cptr;
-                               ncomps++;
-               }
                FINDCOMP(cptr, "dtimenow");
                if (cptr)
                        cptr->c_text = getcpy(dtimenow(0));
@@ -348,9 +340,6 @@ finished:
        if (noisy)
                fputs(scanl, stdout);
 
-       FINDCOMP(cptr, "encrypted");
-       encrypted = cptr && cptr->c_text;
-
        /* return dynamically allocated buffers to pool */
        while ((cptr = *savecomp++)) {
                *--nxtbuf = cptr->c_text;
@@ -361,7 +350,7 @@ finished:
        if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
                DIEWRERR();
 
-       return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
+       return (state != FILEEOF ? SCNERR : SCNMSG);
 }
 
 static int