diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-09-06 21:23:53 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-09-06 21:23:53 -0600 |
| commit | 1fb52f967889d83c23fdd8f3054f5776351ebe85 (patch) | |
| tree | ac158115c0e4946d2e889f0eb3062597d4c94c72 | |
| parent | bf714e42e10de6ff6bce677551c791397048caa5 (diff) | |
| download | alpine-1fb52f967889d83c23fdd8f3054f5776351ebe85.tar.xz | |
Revert " * S/MIME: information on certificates is now available for certificates"
This reverts commit bf714e42e10de6ff6bce677551c791397048caa5.
| -rw-r--r-- | alpine/smime.c | 6 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 | ||||
| -rw-r--r-- | pith/smkeys.c | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/alpine/smime.c b/alpine/smime.c index ca2d1f10..7420ad60 100644 --- a/alpine/smime.c +++ b/alpine/smime.c @@ -1363,9 +1363,9 @@ void smime_manage_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **first_line new_confline(ctmp); (*ctmp)->flags |= CF_NOSELECT; - sprintf(tmp, _("List of %s certificates"), ctype == Public ? _("public") - : (ctype == Private ? _("private") - : (ctype == CACert ? _("certificate authority") : "unknown (?)"))); + sprintf(tmp, _("List of %scertificates"), ctype == Public ? _("public ") + : (ctype == Private ? _("private ") + : (ctype == CACert ? _("certificate authority ") : "unknown (?) "))); (*ctmp)->value = cpystr(tmp); for(i = 0; i < sizeof(tmp) && i < (ps->ttyo ? ps->ttyo->screen_cols : sizeof(tmp)); i++) diff --git a/pith/pine.hlp b/pith/pine.hlp index 2e038ae6..4201eb9c 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 95 2015-09-06 21:11:08 +Alpine Commit 94 2015-09-06 16:11:41 ============= h_news ================= <HTML> <HEAD> diff --git a/pith/smkeys.c b/pith/smkeys.c index 7e992a53..bb77b030 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -1249,7 +1249,6 @@ void add_to_end_of_certlist(CertList **cl, char *name, X509 *cert) { CertList *new, *clp; - char buf[MAILTMPLEN]; if(!cl) return; @@ -1258,12 +1257,6 @@ add_to_end_of_certlist(CertList **cl, char *name, X509 *cert) memset((void *) new, 0, sizeof(*new)); new->x509_cert = cert; new->name = name ? cpystr(name) : NULL; - if(cert && cert->cert_info){ - new->data.date_from = smime_get_date(cert->cert_info->validity->notBefore); - new->data.date_to = smime_get_date(cert->cert_info->validity->notAfter); - get_fingerprint(cert, EVP_md5(), buf, sizeof(buf), NULL); - new->data.md5 = cpystr(buf); - } if(!*cl){ *cl = new; |