summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--VERSION2
-rw-r--r--alpine/osdep/mswin.rc4
-rwxr-xr-xconfigure22
-rw-r--r--doc/alpine.12
-rw-r--r--doc/tech-notes/index.html2
-rw-r--r--doc/tech-notes/tech-notes.txt2
-rw-r--r--include/config.wnt.h6
-rw-r--r--mapi/pmapi.rc4
-rw-r--r--pico/search.c2
-rw-r--r--pith/mailcmd.c2
-rw-r--r--pith/pine.hlp5
-rw-r--r--pith/smime.c117
-rw-r--r--po/Makefile.in2
13 files changed, 90 insertions, 82 deletions
diff --git a/VERSION b/VERSION
index 417faf23..7b054ef0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.19.6
+2.19.7
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index c1317ec7..982ba963 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -267,12 +267,12 @@ BEGIN
#else
VALUE "FileDescription", "Alpine\0"
#endif
- VALUE "FileVersion", "2.19.6\0"
+ VALUE "FileVersion", "2.19.7\0"
VALUE "InternalName", "alpine\0"
VALUE "LegalCopyright", "Copyright 2006-2009\0"
VALUE "OriginalFilename", "alpine.exe\0"
VALUE "ProductName", "alpine\0"
- VALUE "ProductVersion", "2.19.6\0"
+ VALUE "ProductVersion", "2.19.7\0"
END
END
BLOCK "VarFileInfo"
diff --git a/configure b/configure
index 2408f292..e2f231c2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Rev:8 by chappa@washington.edu.
+# From configure.ac Rev:9 by chappa@washington.edu.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.19.6.
+# Generated by GNU Autoconf 2.69 for alpine 2.19.7.
#
# Report bugs to <chappa@washington.edu>.
#
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.19.6'
-PACKAGE_STRING='alpine 2.19.6'
+PACKAGE_VERSION='2.19.7'
+PACKAGE_STRING='alpine 2.19.7'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1596,7 +1596,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alpine 2.19.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.19.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1666,7 +1666,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.19.6:";;
+ short | recursive ) echo "Configuration of alpine 2.19.7:";;
esac
cat <<\_ACEOF
@@ -1952,7 +1952,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.19.6
+alpine configure 2.19.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2558,7 +2558,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alpine $as_me 2.19.6, which was
+It was created by alpine $as_me 2.19.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3379,7 +3379,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.19.6'
+ VERSION='2.19.7'
cat >>confdefs.h <<_ACEOF
@@ -20335,7 +20335,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alpine $as_me 2.19.6, which was
+This file was extended by alpine $as_me 2.19.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20401,7 +20401,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alpine config.status 2.19.6
+alpine config.status 2.19.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/alpine.1 b/doc/alpine.1
index 9810e1a6..54a2e0c1 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.19.6"
+.TH alpine 1 "Version 2.19.7"
.SH NAME
alpine \- an Alternatively Licensed Program for Internet News and Email
.SH SYNTAX
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index 180e857c..f691cc68 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
<BODY>
<H1>Alpine Technical Notes</H1>
-Version 2.19.6, February 2014
+Version 2.19.7, February 2014
<H2><A NAME="TOC">Table of Contents</A></H2><P>
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index 422b061a..57390749 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
Alpine Technical Notes
- Version 2.19.6, February 2014
+ Version 2.19.7, February 2014
Table of Contents
diff --git a/include/config.wnt.h b/include/config.wnt.h
index 630807e9..63b0fabd 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -454,13 +454,13 @@
#define PACKAGE_NAME "alpine"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "alpine 2.19.6"
+#define PACKAGE_STRING "alpine 2.19.7"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "alpine"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.19.6"
+#define PACKAGE_VERSION "2.19.7"
/* Program users use to change their password */
/* #undef PASSWD_PROG */
@@ -552,7 +552,7 @@
#define UTF8_INTERNAL
/* Version number of package */
-#define VERSION "2.19.6"
+#define VERSION "2.19.7"
/* Windows is just too different */
#ifndef _WINDOWS
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index a758e702..bebfb812 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -117,14 +117,14 @@ BEGIN
VALUE "Comments", "alpine info: http://www.washington.edu/alpine\0"
VALUE "CompanyName", "University of Washington\0"
VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
- VALUE "FileVersion", "2.19.6\0"
+ VALUE "FileVersion", "2.19.7\0"
VALUE "InternalName", "pmapi32\0"
VALUE "LegalCopyright", "Copyright ? 2006-2009\0"
VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
VALUE "OriginalFilename", "pmapi32.dll\0"
VALUE "PrivateBuild", " \0"
VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
- VALUE "ProductVersion", "2.19.6\0"
+ VALUE "ProductVersion", "2.19.7\0"
VALUE "SpecialBuild", " \0"
END
END
diff --git a/pico/search.c b/pico/search.c
index e017a83a..82853fab 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -4,7 +4,7 @@ static char rcsid[] = "$Id: search.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
/*
* ========================================================================
- * Copyright 2013 Eduardo Chappa
+ * Copyright 2013-2014 Eduardo Chappa
* Copyright 2006-2008 University of Washington
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pith/mailcmd.c b/pith/mailcmd.c
index ad3e409e..3f310e22 100644
--- a/pith/mailcmd.c
+++ b/pith/mailcmd.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: mailcmd.c 1142 2008-08-13 17:22:21Z hubert@u.washing
/*
* ========================================================================
- * Copyright 2006-2007 University of Washington
* Copyright 2013-2014 Eduardo Chappa
+ * Copyright 2006-2007 University of Washington
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 4cca9be0..147e30d3 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 45 2014-02-15 22:27:53
+Alpine Commit 46 2014-02-17 01:15:10
============= h_news =================
<HTML>
<HEAD>
@@ -241,6 +241,9 @@ Bugs that have been addressed include:
<a href="h_config_psleep"><!--#echo var="VAR_mailcap-check-interval"--></a>
for more information.
<LI> S/MIME: signed messages that contained an attachment would not validate.
+ <LI> S/MIME: signed and encrypted messages from Thunderbird would not
+ validate. Thanks to Andreas Schamanek for testing, debugging and
+ advising during the process of fixing this problem.
<LI> Crash when tcp connection to NNTP server was lost after connection
had been established, but lost immediately afterwards.
<LI> WebAlpine: add _GNU_SOURCE to make pubcookie build.
diff --git a/pith/smime.c b/pith/smime.c
index 8d7bbd27..9d588479 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -4,6 +4,7 @@ static char rcsid[] = "$Id: smime.c 1176 2008-09-29 21:16:42Z hubert@u.washingto
/*
* ========================================================================
+ * Copyright 2013-2014 Eduardo Chappa
* Copyright 2008 University of Washington
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,7 +56,7 @@ static void openssl_extra_randomness(void);
static int app_RAND_write_file(const char *file);
static void smime_init(void);
static const char *openssl_error_string(void);
-static void create_local_cache(char *base, BODY *b);
+static void create_local_cache(char *h, char *base, BODY *b);
static long rfc822_output_func(void *b, char *string);
static int load_private_key(PERSONAL_CERT *pcert);
static void setup_pkcs7_body_for_signature(BODY *b, char *description,
@@ -64,7 +65,7 @@ static BIO *body_to_bio(BODY *body);
static BIO *bio_from_store(STORE_S *store);
static STORE_S *get_part_contents(long msgno, const char *section);
static PKCS7 *get_pkcs7_from_part(long msgno, const char *section);
-static int do_signature_verify(PKCS7 *p7, BIO *in, BIO *out);
+static int do_signature_verify(PKCS7 *p7, BIO *in, BIO *out, int silent);
static int do_detached_signature_verify(BODY *b, long msgno, char *section);
static PERSONAL_CERT *find_certificate_matching_pkcs7(PKCS7 *p7);
static int do_decoding(BODY *b, long msgno, const char *section);
@@ -1081,7 +1082,7 @@ dump_bio_to_file(BIO *in, char *filename)
* manufactured body.
*/
static void
-create_local_cache(char *base, BODY *b)
+create_local_cache(char *h, char *base, BODY *b)
{
if(b->type==TYPEMULTIPART){
PART *p;
@@ -1098,9 +1099,10 @@ create_local_cache(char *base, BODY *b)
#endif
for(p=b->nested.part; p; p=p->next)
- create_local_cache(base, (BODY*) p);
+ create_local_cache(h, base, (BODY*) p);
}
else{
+ cpytxt(&b->mime.text, h+b->mime.offset, b->mime.text.size);
cpytxt(&b->contents.text, base + b->contents.offset, b->size.bytes);
}
}
@@ -1160,11 +1162,9 @@ load_private_key(PERSONAL_CERT *pcert)
ps_global->smime->entered_passphrase = 0;
}
- /* Indicate to the UI that we need re-entry (see mailcmd.c:process_cmd())*/
- if(ps_global->smime)
- ps_global->smime->need_passphrase = 1;
-
if(ps_global->smime){
+ /* Indicate to the UI that we need re-entry (see mailcmd.c:process_cmd())*/
+ ps_global->smime->need_passphrase = 1;
if(ps_global->smime->passphrase_emailaddr){
int i;
for(i = 0; ps_global->smime->passphrase_emailaddr[i] != NULL; i++)
@@ -1550,9 +1550,10 @@ get_pkcs7_from_part(long msgno,const char *section)
* p7 - the pkcs7 object to verify
* in - the plain data to verify (NULL if not detached)
* out - BIO to which to write the opaque data
+ * silent - if non zero, do not print errors, only print success.
*/
static int
-do_signature_verify(PKCS7 *p7, BIO *in, BIO *out)
+do_signature_verify(PKCS7 *p7, BIO *in, BIO *out, int silent)
{
STACK_OF(X509) *otherCerts = NULL;
int result;
@@ -1565,7 +1566,7 @@ do_signature_verify(PKCS7 *p7, BIO *in, BIO *out)
#endif
if(!s_cert_store){
- q_status_message(SM_ORDER | SM_DING, 2, 2,
+ if(!silent) q_status_message(SM_ORDER | SM_DING, 2, 2,
_("Couldn't verify S/MIME signature: No CA Certs were loaded"));
return -1;
@@ -1586,44 +1587,36 @@ do_signature_verify(PKCS7 *p7, BIO *in, BIO *out)
PKCS7_verify(p7, otherCerts, s_cert_store, in, out, PKCS7_NOVERIFY);
}
-
- q_status_message1(SM_ORDER | SM_DING, 3, 3,
+ if (!silent) q_status_message1(SM_ORDER | SM_DING, 3, 3,
_("Couldn't verify S/MIME signature: %s"), (char*) openssl_error_string());
}
/* now try to extract the certificates of any signers */
{
- STACK_OF(X509) *signers;
- int i;
-
- signers = PKCS7_get0_signers(p7, NULL, 0);
+ STACK_OF(X509) *signers;
+ int i;
- if(signers)
- for(i=0; i<sk_X509_num(signers); i++){
+ if((signers = PKCS7_get0_signers(p7, NULL, 0)) != NULL)
+ for(i=0; i<sk_X509_num(signers); i++){
char **email;
- X509 *x = sk_X509_value(signers,i);
- X509 *cert;
-
- if(!x)
- continue;
+ X509 *x, *cert;
- email = get_x509_subject_email(x);
-
- if(email){
+ if((x = sk_X509_value(signers,i)) == NULL)
+ continue;
+
+ if((email = get_x509_subject_email(x)) != NULL){
int i;
for(i = 0; email[i] != NULL; i++){
- cert = get_cert_for(email[i]);
- if(cert)
+ if((cert = get_cert_for(email[i])) != NULL)
X509_free(cert);
else
save_cert_for(email[i], x);
fs_give((void **) &email[i]);
}
fs_give((void **) email);
- }
- }
-
- sk_X509_free(signers);
+ }
+ }
+ sk_X509_free(signers);
}
return result;
@@ -1639,7 +1632,8 @@ free_smime_body_sparep(void **sparep)
}
}
-/* Big comment, explaining the mess that exists out there
+/* Big comment, explaining the mess that exists out there, and how we deal
+ with it, and also how we solve the problems that are created this way.
When Alpine sends a message, it constructs that message, computes the
signature, but then it forgets the message it signed and reconstructs it
@@ -1672,6 +1666,19 @@ free_smime_body_sparep(void **sparep)
3. We do not add \r\n to validate a message that we sent, because that
would only work in Alpine, and not in any other client. That would not
be a good thing to do.
+
+ PART II
+
+ Now we have to deal with encrypted and signed messages. The problem is that
+ c-client makes all its pointers point to "on disk" content, but since we
+ decrypted the data earlier, we have to make sure of two things. One is that we
+ saved that data (so we do not have to decrypt it again) and second that we can
+ use it.
+
+ In order to save the data we use create_local_cache, so that we do not
+ have to redecrypt the message. Once this is saved, c-client functions will
+ find it and send it to us in mail_fetch_mime and mail_fetch_body.
+
*/
/*
@@ -1704,11 +1711,8 @@ do_detached_signature_verify(BODY *b, long msgno, char *section)
snprintf(newSec, sizeof(newSec), "%s%s2", section ? section : "", (section && *section) ? "." : "");
- if((p7 = get_pkcs7_from_part(msgno, newSec)) == NULL)
- return modified_the_body;
-
- /* first try with what get got */
- if((in = BIO_new(BIO_s_mem())) == NULL)
+ if((p7 = get_pkcs7_from_part(msgno, newSec)) == NULL
+ || (in = BIO_new(BIO_s_mem())) == NULL)
return modified_the_body;
(void) BIO_reset(in);
@@ -1716,20 +1720,18 @@ do_detached_signature_verify(BODY *b, long msgno, char *section)
BIO_write(in, bodytext, bodylen);
/* Try compatibility with the past and check if this message
- validates when we remove the last two characters
+ * validates when we remove the last two characters. Silence
+ * any failures first.
*/
- if(((result = do_signature_verify(p7, in, NULL)) == 0)
+ if(((result = do_signature_verify(p7, in, NULL, 1)) == 0)
&& bodylen > 2
&& (strncmp(bodytext+bodylen-2,"\r\n", 2) == 0)){
- BIO_free(in);
- if((in = BIO_new(BIO_s_mem())) == NULL)
- return modified_the_body;
-
- (void) BIO_reset(in);
- BIO_write(in, mimetext, mimelen);
- BIO_write(in, bodytext, bodylen-2);
+ BUF_MEM *biobuf = NULL;
- result = do_signature_verify(p7, in, NULL);
+ BIO_get_mem_ptr(in, &biobuf);
+ if(biobuf)
+ BUF_MEM_grow(biobuf, mimelen + bodylen - 2);
+ result = do_signature_verify(p7, in, NULL, 0);
}
BIO_free(in);
@@ -1945,6 +1947,8 @@ do_decoding(BODY *b, long msgno, const char *section)
b->sparep = p7;
}
+ dprint((1, "type_is_signed = %d, type_is_enveloped = %d", PKCS7_type_is_signed(p7), PKCS7_type_is_enveloped(p7)));
+
if(PKCS7_type_is_signed(p7)){
int sigok;
@@ -1952,12 +1956,11 @@ do_decoding(BODY *b, long msgno, const char *section)
(void) BIO_reset(out);
BIO_puts(out, "MIME-Version: 1.0\r\n"); /* needed so rfc822_parse_msg_full believes it's MIME */
- sigok = do_signature_verify(p7, NULL, out);
-
- /* shouldn't really duplicate these messages */
- what_we_did = sigok ? _("This message was cryptographically signed.") :
- _("This message was cryptographically signed but the signature could not be verified.");
-
+ sigok = do_signature_verify(p7, NULL, out, 0);
+
+ what_we_did = sigok ? _("This message was cryptographically signed.") :
+ _("This message was cryptographically signed but the signature could not be verified.");
+
/* make sure it's null terminated */
BIO_write(out, null, 1);
}
@@ -2041,9 +2044,11 @@ do_decoding(BODY *b, long msgno, const char *section)
bstart += 4; /* skip over CRLF*2 */
INIT(&s, mail_string, bstart, strlen(bstart));
- rfc822_parse_msg_full(&env, &body, h, bstart-h-2, &s, BADHOST, 0, 0);
+ rfc822_parse_msg_full(&env, &body, h, (bstart-h)-2, &s, BADHOST, 0, 0);
mail_free_envelope(&env); /* Don't care about this */
+ body->mime.offset = 0;
+ body->mime.text.size = 0;
/*
* Now convert original body (application/pkcs7-mime)
* to a multipart body with one sub-part (the decrypted body).
@@ -2087,7 +2092,7 @@ do_decoding(BODY *b, long msgno, const char *section)
* IMPORTANT BIT: set the body->contents.text.data elements to contain the decrypted
* data. Otherwise, it'll try to load it from the original data. Eek.
*/
- create_local_cache(bstart, &b->nested.part->body);
+ create_local_cache(bstart-b->nested.part->body.mime.offset, bstart, &b->nested.part->body);
modified_the_body = 1;
}
diff --git a/po/Makefile.in b/po/Makefile.in
index a76b6a33..23e9e0b1 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
# Origin: gettext-0.16
PACKAGE = alpine
-VERSION = 2.19.6
+VERSION = 2.19.7
PACKAGE_BUGREPORT = chappa@washington.edu
SHELL = /bin/sh
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 20:42:25 +0000