Packman Build Service PMBS

topal.spec Changed

@@ -1,15 +1,16 @@
 # norootforbuild
 
 Name:		topal
-Version:	72
-Release:	2
+Version:	76
+Release:	0
 
 Summary:	A tool to encrypt, decrypt, sign and verify emails
 License:	GPLv3
 Group:		Productivity/Networking/Security
-URL:		http://homepage.ntlworld.com/phil.brooke/topal/
+URL:		https://zircon.org.uk/topal/
 
 Source0:	%{name}-package-%{version}.tgz
+Patch0: 	topal.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -22,12 +23,19 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
 export SUSE_ASNEEDED=0
 make \
-	%{?smp_mflags} \
+	versionid.tex \
+	BUILDDATE="`date -u -d '1970-01-01' '+%Y-%m-%dT%H%M%S%Z'`"
+ls -l --time-style=full-iso -t *.pdf *.tex || :
+test -f topal.pdf && touch topal.pdf
+make \
+	binary \
+	TOPALDEBUG=-fpic \
 	BUILDDATE="`date -u -d '1970-01-01' '+%Y-%m-%dT%H%M%S%Z'`"
 
 
@@ -37,11 +45,6 @@
 	INSTALLPATHDOC=%{buildroot}/%{_docdir}/%{name} \
 	BUILDDATE="`date -u -d '1970-01-01' '+%Y-%m-%dT%H%M%S%Z'`"
 
-
-%clean
-rm -rf "%{buildroot}"
-
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/mime-tool

topal.patch Added

topal-package-72.tgz/README.html Deleted

@@ -1,1623 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>
-Topal: GPG/GnuPG and Alpine/Pine integration
-</title>
-<style type="text/css">
-body {
-  font-family: Helvetica, Geneva, Arial,
-        SunSans-Regular, sans-serif ;
-  background-color: #fafffa }
-a:link {
-  color: blue }
-a:visited {
-  color: purple }
-.navbar {
-  text-align: center;
-  font-size: x-small }
-img.validator {
-	float: right
-}
-.tail {
-        text-align: center ;
-        font-size: x-small ;
-        float: none ;
-        clear: both
-}
-</style>
-</head>
-<body>
-
-<hr/>
-
-<h1>Topal: GPG/GnuPG and Alpine/Pine integration</h1>
-
-<p>Copyright (C) 2001--2010  Phillip J. Brooke</p>
-
-<hr/>
-
-<h2>Contents</h2>
-
-<ul>
-<li> <a href="#introduction">Introduction</a></li>
-<li> <a href="#features">Features</a></li>
-<li> <a href="#important-changes">Important changes from previous stable versions</a></li>
-<li> <a href="#inst-and-config">Installation and configuration</a>
-<ul>
-<li> <a href="#comp-and-inst">Compilation and installation</a></li>
-<li> <a href="#pine-patches">Pine/Alpine patches</a></li>
-<li> <a href="#pine-config">Pine/Alpine configuration</a></li>
-<li> <a href="#mailcap-config">Mailcap configuration</a></li>
-<li> <a href="#topal-config">Topal configuration</a></li>
-</ul></li>
-<li> <a href="#topal-usage">Topal usage</a>
-<ul>
-<li> <a href="#topal-help">Help!</a></li>
-<li> <a href="#config">Configuration</a></li>
-<li> <a href="#decrypt-verify">Decryption/verification</a></li>
-<li> <a href="#sending">Sending</a></li>
-<li> <a href="#nonpine">Command-line usage</a>
-<ul>
-<li> <a href="#nps">Sending (<tt>-nps</tt>)</a></li>
-<li> <a href="#pd">Receiving (<tt>-pd</tt>)</a><l/i>
-</ul></li>
-<li> <a href="#remote">Remote and server mode</a></li>
-</ul></li>
-<li> <a href="#fix-multipart">Fixing multipart emails</a></li>
-<li> <a href="#notes">Notes</a>
-<ul>
-<li> <a href="#pinehack">The Pine/Alpine hack, and sending other attachments</a></li>
-<li> <a href="#keyids">Key IDs and keylists</a></li>
-<li> <a href="#sd">Sending defaults</a></li>
-<li> <a href="#errors">Errors</a></li>
-<li> <a href="#decrypt-attachments">Decrypting attachments</a></li>
-<li> <a href="#locale-problems">Locale problems</a></li>
-<li> <a href="#couldnt-find-cert">“Couldn't find certificate needed to sign.”</a></li>
-<li> <a href="#cleaning-cache">Cleaning up the cache</a></li>
-<li> <a href="#remote-notes">Remote and server mode</a></li>
-<li> <a href="#agent">Working with GPG Agent</a></li>
-<li> <a href="#new-releases">New releases</a></li>
-<li> <a href="#release-numbering">Release numbering</a></li>
-<li> <a href="#hints">Hints</a></li>
-</ul></li>
-<li> <a href="#author">Author</a></li>
-<li> <a href="#licence">Licence</a></li>
-<li> <a href="#todo">To do</a></li>
-<li> <a href="#changes">Version history</a>
-<ul>
-<li> <a href="#last-changes">Most recent changes</a></li>
-</ul></li>
-</ul>
-
-<hr/>
-
-<h2><a name="introduction">Introduction</a></h2>
-
-<p>Topal is a &#x2018;glue&#x2019; program that links 
-<a href="http://www.gnupg.org">GnuPG</a>
-and 
-<a href="http://www.washington.edu/pine/">Pine</a>/<a href="http://www.washington.edu/alpine/">Alpine</a>.  It offers
-facilities to encrypt, decrypt, sign and verify emails.   It
-can also be used directly from the command-line.
-</p>
-
-<p>
-Multiple PGP blocks included in the text of a message are
-processed. Decryption and verification output can be cached to reduce
-the number of times the passphrase is entered. RFC2015/3156 multipart
-messages can be sent and received with help from some scripts,
-procmail and a patch to Pine/Alpine. It includes basic support for
-verifying S/MIME multipart/signed messages. There is a remote sending
-mode for reading email on a distant computer via SSH with secret keys
-on the local computer. There is a high level of configurability.
-</p>
-
-<p>See the list
-of <a href="#features">features</a> below.
-</p>
-
-<hr/>
-
-<h2><a name="features">Features</a></h2>
-
-
-
-
-<ul>
-<li> In-place decryption/verification, dealing with multiple blocks
-embedded in text.</li>
-<li> Caching of output to reduce need for passphrase (at expense of
-storing decrypts and verification output).</li>
-<li> Receiving of MIME RFC2015/3156 multipart/signed and
-multipart/encrypted messages.  Top-level multipart items need some
-modification: see the README section &#x2018;fixing multipart emails&#x2019;.  These features are available
-to any program that uses .mailcap files.</li>
-<li> Sending of MIME RFC2015/3156 multipart/signed and multipart/encrypted
-messages.  (Needs a patch to Pine/Alpine.)</li>
-<li> Sending and receiving of the old application/pgp content-type
-(sending requires the same patch as the previous item).</li>
-<li> Basic support for verifying S/MIME multipart/signed messages.</li>
-<li> Offers user the opportunity to check output before sending
-it.</li>
-<li> Remote sending and decryption for when reading email on a distant computer via ssh with secret
-keys on the local computer.</li>
-<li> Rich configuration options.</li>
-<li> Shortcuts for selecting keys, as well as general key selection
-routines when sending email.</li>
-<li> Few arbitrary limits.</li>
-</ul>
-
-
-
-<hr/>
-
-<h2><a name="important-changes">Important changes from previous stable versions</a></h2>
-
-<p>Recent stable releases have been numbered 55, 56, ....  Prior to
-  release 55, the stable releases were 0.7.2, 0.7.8, 0.7.9 and
-  0.7.13.6.</p>
-
-<h3>Important changes in release 70</h3>
-
-<p>The <tt>use-agent</tt> option sets GPG's <tt>--use-agent</tt>
-option as needed.  Don't set it in any other way or it might be confusing....</p>
-
-<h3>Important changes in release 68</h3>
-
-<ul>
-<li>
-The sending interface has changed.  Selecting (for example) &#x2018;e&#x2019; for
-encrypt no longer immediately operates.  Instead, the desired
-operation is chosen, and then &#x2018;g&#x2019; for &#x2018;Go!&#x2019; is used.  This allows
-defaults to be associated with keys and email addresses in a sensible way.
-</li>
-<li>
-The MIME viewer setting <tt>mime-viewer</tt> has been replaced by two
-new settings, one for decrypting and one for verifying.  You should set
-these to suit your preferences.  (The redundant line will be dropped
-the next time you save your configuration inside Topal.)
-</li>
-</ul>
-
-<h3>Important changes in release 65</h3>
-
-<p>
-An additional patch has been added.  This should make the procmail
-recipe redundant.  More testing is required: it may have broken other
-Alpine features.
-</p>
-
-<h3>Important changes in release 60</h3>
-
-<ul>
-<li>MIME sending now requires MIME-tool; mime-construct is no longer
-used.  See <a href="#comp-and-inst">compilation and installation</a>.</li>
-</ul>
-
-<h3>Important changes in release 58</h3>
-

topal-package-72.tgz/README.txt Deleted

@@ -1,1258 +0,0 @@
-     __________________________________________________________________
-
-                  Topal: GPG/GnuPG and Alpine/Pine integration
-
-   Copyright (C) 2001--2010 Phillip J. Brooke
-     __________________________________________________________________
-
-Contents
-
-     * Introduction
-     * Features
-     * Important changes from previous stable versions
-     * Installation and configuration
-          + Compilation and installation
-          + Pine/Alpine patches
-          + Pine/Alpine configuration
-          + Mailcap configuration
-          + Topal configuration
-     * Topal usage
-          + Help!
-          + Configuration
-          + Decryption/verification
-          + Sending
-          + Command-line usage
-               o Sending (-nps)
-               o Receiving (-pd)i>
-          + Remote and server mode
-     * Fixing multipart emails
-     * Notes
-          + The Pine/Alpine hack, and sending other attachments
-          + Key IDs and keylists
-          + Sending defaults
-          + Errors
-          + Decrypting attachments
-          + Locale problems
-          + "Couldn't find certificate needed to sign."
-          + Cleaning up the cache
-          + Remote and server mode
-          + Working with GPG Agent
-          + New releases
-          + Release numbering
-          + Hints
-     * Author
-     * Licence
-     * To do
-     * Version history
-          + Most recent changes
-     __________________________________________________________________
-
-Introduction
-
-   Topal is a `glue' program that links GnuPG and Pine/Alpine. It offers
-   facilities to encrypt, decrypt, sign and verify emails. It can also be
-   used directly from the command-line.
-
-   Multiple PGP blocks included in the text of a message are processed.
-   Decryption and verification output can be cached to reduce the number
-   of times the passphrase is entered. RFC2015/3156 multipart messages can
-   be sent and received with help from some scripts, procmail and a patch
-   to Pine/Alpine. It includes basic support for verifying S/MIME
-   multipart/signed messages. There is a remote sending mode for reading
-   email on a distant computer via SSH with secret keys on the local
-   computer. There is a high level of configurability.
-
-   See the list of features below.
-     __________________________________________________________________
-
-Features
-
-     * In-place decryption/verification, dealing with multiple blocks
-       embedded in text.
-     * Caching of output to reduce need for passphrase (at expense of
-       storing decrypts and verification output).
-     * Receiving of MIME RFC2015/3156 multipart/signed and
-       multipart/encrypted messages. Top-level multipart items need some
-       modification: see the README section `fixing multipart emails'.
-       These features are available to any program that uses .mailcap
-       files.
-     * Sending of MIME RFC2015/3156 multipart/signed and
-       multipart/encrypted messages. (Needs a patch to Pine/Alpine.)
-     * Sending and receiving of the old application/pgp content-type
-       (sending requires the same patch as the previous item).
-     * Basic support for verifying S/MIME multipart/signed messages.
-     * Offers user the opportunity to check output before sending it.
-     * Remote sending and decryption for when reading email on a distant
-       computer via ssh with secret keys on the local computer.
-     * Rich configuration options.
-     * Shortcuts for selecting keys, as well as general key selection
-       routines when sending email.
-     * Few arbitrary limits.
-     __________________________________________________________________
-
-Important changes from previous stable versions
-
-   Recent stable releases have been numbered 55, 56, .... Prior to release
-   55, the stable releases were 0.7.2, 0.7.8, 0.7.9 and 0.7.13.6.
-
-  Important changes in release 70
-
-   The use-agent option sets GPG's --use-agent option as needed. Don't set
-   it in any other way or it might be confusing....
-
-  Important changes in release 68
-
-     * The sending interface has changed. Selecting (for example) `e' for
-       encrypt no longer immediately operates. Instead, the desired
-       operation is chosen, and then `g' for `Go!' is used. This allows
-       defaults to be associated with keys and email addresses in a
-       sensible way.
-     * The MIME viewer setting mime-viewer has been replaced by two new
-       settings, one for decrypting and one for verifying. You should set
-       these to suit your preferences. (The redundant line will be dropped
-       the next time you save your configuration inside Topal.)
-
-  Important changes in release 65
-
-   An additional patch has been added. This should make the procmail
-   recipe redundant. More testing is required: it may have broken other
-   Alpine features.
-
-  Important changes in release 60
-
-     * MIME sending now requires MIME-tool; mime-construct is no longer
-       used. See compilation and installation.
-
-  Important changes in release 58
-
-     * The default configuration no longer uses absolute paths.
-
-  Important changes in release 55
-
-     * If you use a non-English locale, please check that Topal still
-       works as expected (replaced code that fixed some locale problems).
-     * The Alpine patch is based off my old Pine patches, but does a
-       little more. You will need to set the Enable Topal hack for
-       OpenPGP/MIME messages option in the hidden configuration list. Bug
-       reports welcome.
-     * The --fix-email wrapper no longer creates a multipart/alternative:
-       it creates a multipart/misc wrapper instead. Please check that your
-       procmail recipe includes a suitable backup in case this doesn't
-       work for you.
-
-  Important changes in version 0.7.10
-
-   The recommended procmail recipe has been changed.
-
-  Important changes in version 0.7.8
-
-   topal-fix-email and topal-fix-folder have been replaced by the main
-   topal binary. Change topal-fix-email in your .procmailrc to be topal
-   --fix-email. (Or add symlinks: the binary checks what it has been
-   called as.)
-
-   You must clear your cache otherwise the changes made for
-   inline-separate-output (added in version 0.7.8) will break (this occurs
-   regardless of whether the option is on or off). This new feature shows
-   the GnuPG/Topal output separately, then hands back the decrypted or
-   verified output without any wrappers. This makes it more suitable for
-   dealing with attachments (but you need to set it manually via topal
-   -config).
-
-   Finally, the send menu has a new option: `Pass through unchanged'. This
-   does nothing to the message so, you can always have Topal invoked as a
-   filter for sending.
-     __________________________________________________________________
-
-Installation and configuration
-
-  Compilation and installation
-
-   To compile Topal, you need
-     * a working C compiler,
-     * the GNU Ada Compiler (GNAT), and
-     * some common libraries, including readline (e.g., the package
-       libreadline5-dev on Debian).
-
-   There is a makefile: simply type make. Type make install to actually
-   install. The default location is /usr, so you'll need to be root to
-   install. Alternatively, use make install INSTALLPATH=/usr/local to
-   install into /usr/local. (Or use the more specific variables
-   INSTALLPATHBIN, INSTALLPATHMAN, INSTALLPATHDOC and INSTALLPATHPATCHES.)
-
-   (Cygwin users: before using the makefile, please apply the patch
-   cygwin.patch. I haven't recently tested this....)
-
-    MIME sending
-
-   MIME sending requires the Topal version of mime-tool (included with the
-   Topal sources, and compiled and installed at the same time using the
-   Makefile). Also see Pine/Alpine patches below.
-
-    MIME viewing
-
-   MIME viewing can be handled via metamail, run-mailcap, or by saving to
-   a file in the ~/.topal directory and viewed with Alpine. If you are
-   using the second patch (see Pine/Alpine patches below), then depending
-   on your Alpine configuration, Alpine might say something like
-   "Attachment SIGNED unrecognized. Try opening anyway?" - you should say
-   yes in that case.

topal-package-72.tgz/expanding_array.adb Deleted

@@ -1,169 +0,0 @@
--- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License version 3 as
--- published by the Free Software Foundation.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-with Ada.Text_IO;
-with Ada.Unchecked_Deallocation;
-
-package body Expanding_Array is
-
-   procedure Actual_Array_Free
-   is new Ada.Unchecked_Deallocation (Actual_Array, Actual_Array_Pointer);
-
-   procedure Natural_Free
-   is new Ada.Unchecked_Deallocation (Natural, Natural_Pointer);
-
-   procedure Positive_Free
-   is new Ada.Unchecked_Deallocation (Positive, Positive_Pointer);
-
-   procedure Initialize (Object : in out Big_Array) is
-   begin
-      Object.Ref_Count := new Natural;
-      Object.Ref_Count.all := 1;
-   end Initialize;
-
-   procedure Adjust (Object : in out Big_Array) is
-   begin
-      Object.Ref_Count.all := Object.Ref_Count.all + 1;
-   end Adjust;
-
-   procedure Finalize (Object : in out Big_Array) is
-   begin
-      Object.Ref_Count.all := Object.Ref_Count.all - 1;
-      begin
-         if Object.Ref_Count.all = 0 then
-            Actual_Array_Free(Object.Actual);
-            Natural_Free(Object.Ref_Count);
-            Positive_Free(Object.Array_Size);
-         end if;
-      exception
-         when others =>
-            Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                                 "AIEEE! Exception raised in Expanding_Array.Finalise");
-      end;
-   end Finalize;
-
-   procedure Create (Left         : in out Big_Array;
-                     Initial_Size : in     Positive) is
-      A : Big_Array;
-   begin
-      A.Actual := new Actual_Array(1..Initial_Size);
-      A.Array_Size := new Positive;
-      A.Array_Size.all := Initial_Size;
-      Left := A;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Create");
-         raise;
-   end Create;
-
-   procedure Copy (Left  : in out Big_Array;
-                   Right : in     Big_Array) is
-      A : Big_Array;
-   begin
-      -- Now, deep copy the array.
-      A.Actual := new Actual_Array(1..Size(Right));
-      A.Array_Size := new Positive;
-      A.Array_Size.all := Size(Right);
-      A.Actual.all(1..A.Array_Size.all) := Right.Actual.all(1..Right.Array_Size.all);
-      Left := A;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Copy");
-         raise;
-   end Copy;
-
-   function Size (A : Big_Array) return Positive is
-   begin
-      return A.Array_Size.all;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Size");
-         raise;
-   end Size;
-
-   function Last (A : Big_Array) return Positive is
-   begin
-      return Size(A);
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Last");
-         raise;
-   end Last;
-
-   procedure Expand(A : in out Big_Array;
-                    S : in     Positive) is
-      New_Actual : Actual_Array_Pointer;
-   begin
-      New_Actual := new Actual_Array(1..A.Array_Size.all + S);
-      New_Actual.all(1..A.Array_Size.all) := A.Actual.all(1..A.Array_Size.all);
-      Actual_Array_Free(A.Actual);
-      A.Actual := New_Actual;
-      A.Array_Size.all := A.Array_Size.all + S;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Expand");
-         raise;
-   end Expand;
-
-   function First (A : Big_Array) return Natural is
-   begin
-      return A.Actual.all'First;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.First");
-         raise;
-   end First;
-
-   procedure Set(A     : in out Big_Array;
-                 Index : in     Positive;
-                 Value : in     Item) is
-   begin
-      -- Is the array large enough?
-      while Last(A) < Index loop
-         -- Double the size....
-         Expand(A, A.Array_Size.all);
-      end loop;
-      -- Set the value.
-      if A.Actual = null then
-         raise Actual_Is_Null;
-      else
-         A.Actual(Index) := Value;
-      end if;
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Set");
-         raise;
-   end Set;
-
-   function Value(A     : Big_Array;
-                  Index : Positive) return Item is
-   begin
-      return A.Actual(Index);
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Expanding_Array.Value");
-         raise;
-   end Value;
-
-
-end Expanding_Array;

topal-package-72.tgz/expanding_array.ads Deleted

@@ -1,72 +0,0 @@
--- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License version 3 as
--- published by the Free Software Foundation.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
--- This package creates an instance of an array that expands.
-
-with Ada.Finalization;
-
-generic
-   type Item is private;
-package Expanding_Array is
-
-   type Big_Array is limited private;
-
-   procedure Create (Left         : in out Big_Array;
-                     Initial_Size : in     Positive);
-
-   procedure Copy (Left  : in out Big_Array;
-                   Right : in     Big_Array);
-
-   procedure Set(A     : in out Big_Array;
-                 Index : in     Positive;
-                 Value : in     Item);
-
-   function Value(A     : Big_Array;
-                  Index : Positive) return Item;
-
-   function First (A : Big_Array) return Natural;
-
-   function Size (A : Big_Array) return Positive;
-
-   function Last (A : Big_Array) return Positive;
-
-   -- Increase the array by this much.
-   procedure Expand(A : in out Big_Array;
-                    S : in     Positive);
-   -- If an attempt is made to use Set for an index beyond Last, then the
-   -- array size will be doubled until it is large enough.  So this call
-   -- should never need to be explicitly used.
-
-   Actual_Is_Null : exception;
-
-private
-
-   type Actual_Array is array (Positive range <>) of Item;
-   type Actual_Array_Pointer is access Actual_Array;
-
-   type Natural_Pointer is access all Natural;
-   type Positive_Pointer is access all Positive;
-
-   type Big_Array is new Ada.Finalization.Controlled
-     with record
-      Actual     : Actual_Array_Pointer;
-      Array_Size : Positive_Pointer;
-      Ref_Count  : Natural_Pointer;
-     end record;
-   procedure Initialize (Object : in out Big_Array);
-   procedure Adjust (Object : in out Big_Array);
-   procedure Finalize (Object : in out Big_Array);
-
-end Expanding_Array;

topal-package-76.tgz/Buildflags.mk Added

topal-package-76.tgz/Changelog.html Added

@@ -0,0 +1,698 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+Topal — Changelog
+</title>
+<style type="text/css">
+body {
+  font-family: Helvetica, Geneva, Arial,
+        SunSans-Regular, sans-serif ;
+  background-color: #fafffa }
+a:link {
+  color: blue }
+a:visited {
+  color: purple }
+.navbar {
+  text-align: center;
+  font-size: x-small }
+img.validator {
+	float: right
+}
+.tail {
+        text-align: center ;
+        font-size: x-small ;
+        float: none ;
+        clear: both
+}
+</style>
+</head>
+<body>
+
+<hr/>
+
+<h1>Topal — Changelog</h1>
+
+<p>Copyright © 2001–2015  Phillip J. Brooke</p>
+
+<dl>
+<dt>06/2001, 0.1</dt> <dd>First alpha release.</dd>
+
+<dt>06/2001, 0.2</dt> <dd>Minor changes.</dd>
+
+<dt>06/2001, 0.3</dt> <dd>Major changes to how keys are identified and
+looked up.</dd>
+
+<dt>06/2001, 0.4</dt> <dd>Adding more customization features.</dd>
+
+<dt>11/2001, 0.4.4</dt> <dd>Cleaned up some error messages; added -nps
+mode.</dd>
+
+<dt>11/2001, 0.4.5</dt> <dd>Added &#x2018;gpg-options&#x2019; config item with
+default &#x2018;--no-options&#x2019;.  (Forgot to add this note as well....)</dd>
+
+<dt>11/2001, 0.5.0</dt> <dd>Dumped -verify and -decrypt modes in
+favour of the multiple-block &#x2018;-display&#x2019; mode.  Added -help.  Added
+caching.  Added more switches relating to caching.  Better output
+formatting.</dd>
+
+<dt>11/2001, 0.5.1</dt> <dd>Improved menus.  Tidied up some of the
+interface.  Added -s, which does the same as -nps.</dd>
+
+<dt>12/2001, 0.5.2</dt> <dd>Tidied disclaimer.  Added synonyms for
+-help (-h, -?, --help, --h) Cleaned up menus; keypresses aren't echoed
+any longer.</dd>
+
+<dt>12/2001, 0.5.3</dt> <dd>Altered packaging to include version in
+directory name.  Changed names of some -clear options to be a bit more
+sensible.  Changing config settings method (big change).  Making -s
+the default operation.  Some rearrangement of code, constants.  Some
+configuration editing possible via Topal.  Send has access to
+configuration menu.  </dd>
+
+<dt>12/2001, 0.5.4</dt> <dd>Bug fix; one-off error in the sending
+menus.</dd>
+
+<dt>12/2001, 0.5.5</dt> <dd>Removed redundant examples directory.
+Changed over to HTML documentation.  Tweaked the RELEASE stuff.  Use
+space instead of enter when waiting to continue: this looks forward to
+offering a help option at every prompt.  The receive/blocks
+stuff now uses an expanding array.  The GPG return value is checked
+when receiving: if it's bad, then some bits of the output are omitted;
+the cache file is not written.  The date bit of Topal output moved
+onto the previous line (echo -n blah blah).</dd>
+
+<dt>12/2001, 0.5.6</dt> <dd>Adding installation instructions.  Using
+tee and PIPESTATUS to get stderr on screen during receiving while also
+saving that output and recording gpg's exit status.  Changed RELEASE
+filename to release.  Tidied up the Makefile.  Invalid passphrase
+messages are grep'd out of the output.  Added &#x2018;fast continue&#x2019; options.
+Key lists in the configuration section now use expanding arrays.
+Changed key details selection message.  Secret key selection now
+offers a menu of secret keys on the secret keyring.  Initial recipient
+search excludes keys in XK list.  Added key search/selection menu
+choice - much nicer to use than the add menu.  More configuration
+stuff added (still more to do, although the config file can always be
+used).  Partial documentation update.</dd>
+
+<dt>2/2002, 0.5.7</dt> <dd>Adding limited RFC2015/MIME decoding of
+multipart email.</dd>
+
+<dt>2/2002, 0.5.8</dt> <dd>Adding mime-construct to configuration in
+expectation of more RFC2015 features.  Put test for the config file
+existing before actually attempting to read it (oops).  Added -O2
+-Wall and the TOPALDEBUG variable for compiling. Put up WWW page via
+own Freeserve site.  Announcing via Freshmeat.  Automating output WWW
+site generation (all the grunge in the Makefile).</dd>
+
+<dt>3/2002, 0.6.0</dt> <dd>Distribution uses a gzip'd binary now....
+Added a pre-built binary that is statically linked against the GNAT
+stuff so that people don't need to acquire GNAT first (this, I
+believe, complies with the GNAT licence).  <br/> Added the scripts
+topal-fix-email and topal-fix-folder.  This makes it a lot easier to
+work with other people's multipart/signed or /encrypted email.
+Procmail recipe added to this README.<br/>Added display of
+application/pgp messages.  Including the text of one of these in a
+reply might be difficult, but then, it was difficult without topal's
+mangling.  At least they can be verified and read now.<br/>-sendmime
+option added. Hack needed (in topal-pine-patch [now pine-4.44.patch])
+to allow non-text/blah content-types in Pine.  RFC2015 send and
+received done (including micalg detection when sending clearsigned
+messages: list used from RFC3156.).  Ditto for application/pgp, but
+I'm not sure of some of the parameters, since I've only ever seen
+signed emails of this form.<br/>Removed some of the waits for execution,
+since it seems reliable.  Added error checking on return value of GPG
+in sends.</dd>
+
+<dt>3/2002, 0.6.1</dt> <dd>The Content-Type for MIME sending is
+displayed on the screen using &#x2018;cat&#x2019; rather than &#x2018;less&#x2019;, which was
+getting to be annoying.<br/>Two changes that are related to how I
+manage the source code: Slight tweak to makefile for keeping track
+of RCS files; and using rcs -n&lt;symbolic-name&gt; to tag the
+released files.</dd>
+
+<dt>3/2002, 0.6.2</dt> <dd>MIME clear-signed messages: trailing blank
+lines are now deleted before signing (this would cause BAD signature
+when verifying on some other MTAs).  Added remarks to documentation
+about the patch to Pine and attachments.</dd>
+
+<dt>4/2002, 0.6.3</dt> <dd>RFC1847 multipart encapsulation added.
+(See section 6.1 of RFC3156.)  Cleaned up related receiving/caching
+behaviour.<br/>Another MIME clear-signed messages bugfix.  This one
+sorts out line-end conventions correctly.  <br/>New patch for Pine: this
+stops a SEGFAULT when using RFC2015 stuff and other attachments at the
+same time.<br/>Updated documentation; added man pages for the two scripts.</dd>
+
+<dt>4/2002, 0.6.4</dt> <dd>New patch for Pine.  Adds a workaround for
+the problem where some versions of MS Exchange would silently lose
+inbound MIME clearsigned email.  It turns out that a slight formatting
+change stops the problem.</dd>
+
+<dt>5/2002, 6/2002; 0.6.5, 0.6.6, 0.6.7, 0.6.8</dt> <dd>Adding more debugging,
+mostly to the menus code.  Used for tracking down a nasty problem
+causing exceptions.  Many thanks to Felix Madlener for pointing this
+out and testing the revised code.</dd>
+
+<dt>7/2002, 0.6.9</dt><dd>Renamed the Pine patch for when new versions
+come out.  (It's still the same patch as for Topal 0.6.4.)  Added trap
+for non-existent file when using &#x2018;-s&#x2019;.  Cache directory as well as
+.topal directory is also chmod'd to 700.  Added README.txt to package
+file (even though it's generated from the .html) so that those who
+just want to &#x2018;less&#x2019; it (instead of firing up a HTML reader) can do so.</dd>
+
+<dt>8/2002, 0.7.0</dt><dd>Changed email address in man page.  Lots more
+exception handling for extra info when something goes wrong.  Moderate
+code reorganisation: mostly splitting blocks of code out for future
+work.  Fixed &#x2018;bug&#x2019; (feature?) where send fails if a public key is
+unusable (although this may risk sending plaintext through; we assume
+that if an output file was generated, then the GPG errors weren't
+fatal).  Now we check instead if the output file exists.  Checking all
+source files for any similar bugs in menus (cf. the 5/2002 entry).
+Modified MIME RFC2015 receiving function so that it isn't so reliant
+on shell calls of sed (which can fall over with nasty characters in an
+incoming emails boundary).  Moreover, it can now cope with MIME parts
+that don't end with a newline.  Tweaking MIME/verify cache handling:
+we shouldn't actually get an output file from GPG (since we're only
+verifying one part with the other); we put a vague warning if this
+happens, and trap when reading the cache.  Added content-type to
+plaintext for MIME/encrypted.  Documentation update.</dd>
+
+<dt>8/2002, 0.7.1</dt><dd>Fixed minor bug with inverted return code
+(&#x2018;-s&#x2019; trap).  Doc update.</dd>
+
+<dt>9/2002, 0.7.2</dt><dd>Fixed minor bug in key list handling code
+(dealing with key selection).</dd>
+
+<dt>9/2002; 0.7.3, 0.7.4 (BETA)</dt><dd>Disposed of the dependency on a shell by
+introducing Ada bindings for fork/exec/dup/pipe/glob, etc..  Several
+external binaries are no longer needed (cat, echo).  Most return codes
+are now properly checked (although still need to do a better audit).
+Followed Eduardo Chappa's advice and changed Pine patch version
+letter.  Miscellaneous cleanups and fixes.  Many thanks to Peter
+Losher for giving me the incentive to sort out the external calls.</dd>
+
+<dt>9/2002; 0.7.5 (BETA)</dt><dd>Tidying up structure of external calls, and
+how the various messages are built up and torn down.  Changed the lynx
+switches at the suggestion of Felix Madlener (many thanks!).  When
+receiving MIME encrypted attachments, the output is not included in
+the Topal output, but only in the metamail invocation.</dd>
+

topal-package-76.tgz/Features.html Added

@@ -0,0 +1,93 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+Topal — Features
+</title>
+<style type="text/css">
+body {
+  font-family: Helvetica, Geneva, Arial,
+        SunSans-Regular, sans-serif ;
+  background-color: #fafffa }
+a:link {
+  color: blue }
+a:visited {
+  color: purple }
+.navbar {
+  text-align: center;
+  font-size: x-small }
+img.validator {
+	float: right
+}
+.tail {
+        text-align: center ;
+        font-size: x-small ;
+        float: none ;
+        clear: both
+}
+</style>
+</head>
+<body>
+
+<hr/>
+
+<h1>Topal — Features</h1>
+
+<p>Copyright © 2001–2015  Phillip J. Brooke</p>
+
+
+<p>Topal is a &#x2018;glue&#x2019; program that links 
+<a href="http://www.gnupg.org">GnuPG</a>
+and 
+<a href="http://www.washington.edu/pine/">Pine</a>/<a href="http://www.washington.edu/alpine/">Alpine</a>/<a href="http://sourceforge.net/projects/re-alpine/">Re-Alpine</a>.
+It
+offers facilities to encrypt, decrypt, sign and verify emails,
+including inline OpenPGP, MIME/OpenPGP and S/MIME.  It can also be
+used directly from the command-line.
+</p>
+
+
+
+
+<ul>
+<li> Multiple inline PGP blocks can be processed in display filters.
+</li>
+<li> Decryption and verification output can be cached to reduce the
+  number of times a passphrase is entered.  This also helps when
+  secret keys aren't always available, at the expense of storing
+  decrypted output.  
+</li>
+<li> MIME/OpenPGP (RFC2015/RFC3156) multipart messages can be sent
+  and received.  Depending on configuration, this might involve
+  procmail, using <tt>sendmail-path</tt> or patching Alpine.
+</li>
+<li> The deprecated application/pgp content-type can be sent and received.
+</li>
+<li> S/MIME messages can be sent and received if <tt>gpgsm</tt> is
+  available.  (<tt>openssl</tt> is also used in some circumstances, but
+  <tt>gpgsm</tt> is still required.)
+</li>
+<li> Topal can be used as Alpine's <tt>sendmail-path</tt> command.
+</li>
+<li> Topal has a remote sending mode (a server and a means of
+  accessing the server) for reading email on a distant computer via
+  SSH with secret keys on the local computer.
+</li>
+<li> A range of mechanisms for selecting keys for both self and recipients.
+</li>
+<li> There is a high level of configurability (although the
+  configuration interface does not expose all of it; you might have to
+  edit <tt>.topal/config</tt>).
+</li></ul>
+
+
+
+<hr/>
+
+<p>See the documentation in <a href="topal.pdf"><tt>topal.pdf</tt></a>
+  for further details.</p>
+
+<hr/>
+
+</body>
+</html>

topal-package-72.tgz/MIME-tool/Makefile -> topal-package-76.tgz/MIME-tool/Makefile Changed

topal-package-72.tgz/MIME-tool/mime-tool -> topal-package-76.tgz/MIME-tool/mime-tool Changed

topal-package-72.tgz/MIME-tool/mime.c -> topal-package-76.tgz/MIME-tool/mime.c Changed

@@ -28,6 +28,9 @@
 **       - Add option to omit disposition name (-N).
 **       - Man page update.
 **       - Typo corrections.
+** Updated March 2011 by Phillip J. Brooke:
+**       - Bug fix in base64() where very short files (1 or 2 byte) 
+**         weren't processed.
 **
 ** This software is licensed for use under the terms of the GNU General
 ** Public License (also called the GPL), a copy of which must be included
@@ -246,20 +249,23 @@
 			break;
 		printf("\n");
 	}while(!feof(f));
-	if(ferror(f))
+	if(ferror(f)) {
+		DEBUG(fprintf(stderr, "ferror in base64 encode\n"));
 		return 1;
+	}
 	else
 	{ /* handle any trailing input bytes (1 or 2 trailing bytes) */
 		int b0, b1, b2; /* output base64 characters */
 
-		if(i)
-		{
+		DEBUG(fprintf(stderr, "Handling trailing bytes.  n=%d, i=%d\n", n, i));
+
 			if(n-i==1)
 			{ /* write out a single input byte as 2 base64 characters */
 				b0=(buf[i]>>2)&0x3f;
 				b1=((buf[i]<<4)&0x30)&0x3f;
 				printf("%c%c==", b64[b0], b64[b1]);
-			}else
+			}
+			if(n-i==2)
 			{ /* write out two input bytes as 3 base64 characters */
 				b0=(buf[i]>>2)&0x3f;
 				b1=(((buf[i]<<4)&0x30)|((buf[i+1]>>4)&0xf))&0x3f;
@@ -267,7 +273,7 @@
 				printf("%c%c%c=", b64[b0], b64[b1],
 					b64[b2]);
 			}
-		}
+		
 	}
 	return 0;
 }

topal-package-72.tgz/Makefile -> topal-package-76.tgz/Makefile Changed

@@ -1,5 +1,5 @@
 # Topal: GPG/GnuPG and Alpine/Pine integration
-# Copyright (C) 2001--2010  Phillip J. Brooke
+# Copyright (C) 2001--2015  Phillip J. Brooke
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -13,21 +13,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-.PHONY:	all clean realclean distclean package install distrib all2 FORCE
+.PHONY:	all binary doc clean realclean distclean package install distrib all2 FORCE
 
-RELEASECODE=$(shell grep '^<dt>' README.html | tail -1 | sed 's/.* release //; sx</a>.*$$xx')
+SHELL=bash
+RELEASECODE=$(shell grep '^<dt>' Changelog.html | tail -1 | sed 's/.* release //; sx</a>.*$$xx')
 BUILDDATE=$(shell date '+%Y-%m-%dT%H%M%S%Z')
 
 # If you intend to redistribute this package, you will obviously need
 # to substitute your own key id here.
-MYKEY=0x50973B91
+MYKEY=0x47DC67A1
 
+include Buildflags.mk
 
 GENFILES=$(addprefix ./,version_id.adb help.ads help.adb b~topal.ads b~topal.adb)
 CFILES=$(shell find . -maxdepth 1 -name \*.c)
 ADSFILES=$(filter-out $(GENFILES),$(shell find . -maxdepth 1 -name \*.ads))
 ADBFILES=$(filter-out $(GENFILES),$(shell find . -maxdepth 1 -name \*.adb))
-OTHERFILES=Makefile README.html topal.man COPYING mkversionid mkhelp help.txt mkdistrib $(shell find . -maxdepth 1 -name pine-\*.patch) $(shell find . -maxdepth 1 -name alpine-\*.patch) $(shell find . -maxdepth 1 -name alpine-\*.patch-\*)
+OTHERFILES=Makefile Buildflags.mk Changelog.html Features.html topal.pdf topal.tex topal.man COPYING mkversionid mkversionidtex mkhelp help.txt mkdistrib cygwin.patch $(shell find . -maxdepth 1 -name pine-\*.patch) $(shell find . -maxdepth 1 -name alpine-\*.patch) $(shell find . -maxdepth 1 -name alpine-\*.patch-\*)
 TOPALDEPS=ada-readline-c.o ada-echo-c.o externals-c.o version_id.adb help.ads help.adb $(ADSFILES) $(ADBFILES)
 
 INSTALLPATH ?= /usr
@@ -36,59 +38,49 @@
 INSTALLPATHDOC ?= $(INSTALLPATH)/share/doc/topal
 INSTALLPATHPATCHES ?= $(INSTALLPATH)/share/topal/patches
 
+
 # The default action.
-all:	topal mime-tool README.txt
+all:	binary topal.pdf
+
+binary: topal mime-tool
 
 all2:	package distrib
 
 ada-readline-c.o:	ada-readline-c.c
-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c
+	gcc -c $(DEBCFLAGS) $(TOPALDEBUG) ada-readline-c.c
 
 ada-echo-c.o:	ada-echo-c.c
-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c
+	gcc -c $(DEBCFLAGS) $(TOPALDEBUG) ada-echo-c.c
 
 externals-c.o:	externals-c.c
-	gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c
+	gcc -c $(DEBCFLAGS) $(TOPALDEBUG) externals-c.c
 
 mime-tool:	
 	make -C MIME-tool
 
 topal:	$(TOPALDEPS)
-	gnatmake -gnatwa -gnato -O2 $(TOPALDEBUG) topal
+	gnatmake -gnat2012 -gnatwa -gnata -gnato -gnateE $(DEBADAFLAGS) $(TOPALDEBUG) topal -largs $(DEBLDFLAGS)
 	-strip topal
 
-topal.gz:	topal
-	gzip -c9 topal > topal.gz
-
-topal.gz.asc:	topal.gz
-	-rm topal.gz.asc
-	-gpg --detach-sign --armor --local-user=$(MYKEY) --use-agent topal.gz
-
-topal-ps:	$(TOPALDEPS)
-	gnatmake -gnatwa -gnato -o topal-ps -O2 $(TOPALDEBUG) topal -bargs -static
-	-strip topal-ps
-
-topal-ps.gz:	topal-ps
-	gzip -c9 topal-ps > topal-ps.gz
-
-topal-ps.gz.asc:	topal-ps.gz
-	-rm topal-ps.gz.asc
-	-gpg --detach-sign --armor --local-user=$(MYKEY) --use-agent topal-ps.gz
-
 # FORCE, because BUILDDATE changes each time....
 version_id.adb:	mkversionid FORCE
 	./mkversionid $(RELEASECODE) $(BUILDDATE)
 
+versionid.tex:	mkversionidtex FORCE
+	./mkversionidtex $(RELEASECODE) $(BUILDDATE)
+
 help.ads help.adb: mkhelp help.txt
 	./mkhelp
 
-README.txt:	README.html
-	lynx -dont_wrap_pre -underscore -nolist -dump README.html > README.txt
+doc:	topal.pdf
+
+topal.pdf:	topal.tex versionid.tex
+	pdflatex topal.tex && pdflatex topal.tex
 
 install:	all
 	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
 	install -m 755 -s topal $(INSTALLPATHBIN)
-	install -m 644 README.html README.txt COPYING $(INSTALLPATHDOC)
+	install -m 644 Features.html Changelog.html topal.pdf COPYING $(INSTALLPATHDOC)
 	install -m 644 topal.man $(INSTALLPATHMAN)/man1/topal.1
 	install -m 644 pine-*.patch alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
 	install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN)
@@ -96,7 +88,9 @@
 
 clean:
 	-rm *.o *.ali $(GENFILES)
-# Clean packaging directories.
+	# Clean LaTeX stuff.
+	-rm topal.{toc,out,log,aux}
+	# Clean packaging directories.
 	-rm -rf topal-[0-9]*
 	make -C MIME-tool clean
 
@@ -107,10 +101,10 @@
 
 package:	topal-package-$(RELEASECODE).tgz topal-package-$(RELEASECODE).tgz.asc
 
-topal-package-$(RELEASECODE).tgz:	$(CFILES) $(ADSFILES) $(ADBFILES) $(OTHERFILES) README.txt
+topal-package-$(RELEASECODE).tgz:	$(CFILES) $(ADSFILES) $(ADBFILES) $(OTHERFILES) doc
 	-rm -rf topal-$(RELEASECODE)
 	mkdir topal-$(RELEASECODE)
-	cp -r $(CFILES) $(ADSFILES) $(ADBFILES) $(OTHERFILES) README.txt MIME-tool topal-$(RELEASECODE)
+	cp -r $(CFILES) $(ADSFILES) $(ADBFILES) $(OTHERFILES) MIME-tool screens topal-$(RELEASECODE)
 	find topal-$(RELEASECODE) -type f | xargs chmod 644
 	find topal-$(RELEASECODE) -type f -name mk\* | xargs chmod 755
 	chmod 755 topal-$(RELEASECODE)
@@ -121,10 +115,10 @@
 	-rm topal-package-$(RELEASECODE).tgz.asc
 	-gpg --detach-sign --armor --local-user=$(MYKEY) --use-agent topal-package-$(RELEASECODE).tgz
 
-distrib:	 topal-package-$(RELEASECODE).tgz.asc topal.gz.asc topal-ps.gz.asc mkdistrib
+distrib:	 topal-package-$(RELEASECODE).tgz.asc mkdistrib
 	-rm -rf www
 	mkdir www
-	cp topal-package-$(RELEASECODE).tgz topal-package-$(RELEASECODE).tgz.asc topal.gz topal.gz.asc topal-ps.gz topal-ps.gz.asc README.html COPYING pine-*.patch alpine-*.patch alpine-*.patch-* www
+	cp topal-package-$(RELEASECODE).tgz topal-package-$(RELEASECODE).tgz.asc topal.pdf Changelog.html COPYING www
 	cd www && ../mkdistrib $(RELEASECODE)
 
 FORCE:

topal-package-72.tgz/ada-echo-c.c -> topal-package-76.tgz/ada-echo-c.c Changed

topal-package-76.tgz/alpine-2.02.patch-1 Added

@@ -0,0 +1,469 @@
+diff -cr alpine-2.02-orig/alpine/send.c alpine-2.02-p1/alpine/send.c
+*** alpine-2.02-orig/alpine/send.c	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/alpine/send.c	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 4039,4044 ****
+--- 4039,4061 ----
+      pbf = save_previous_pbuf;
+      g_rolenick = NULL;
+  
++     /* Topal: Unmangle the body types. */
++     if ((*body)->type == TYPEMULTIPART 
++ 	&& (*body)->topal_hack == 1) {
++       /* This was a single part message which Topal mangled. */
++       dprint((9, "Topal: unmangling single part message\n"));
++       (*body)->type = TYPETEXT;
++     }
++     if ((*body)->type == TYPEMULTIPART
++ 	&& (*body)->topal_hack != 1
++ 	&& (*body)->nested.part->body.type == TYPEMULTIPART
++ 	&& (*body)->nested.part->body.topal_hack == 1) {
++       /* Topal mangled a multipart message.  So the first nested part
++ 	 is really TYPETEXT. */
++       dprint((9, "Topal: unmangling first part of multipart message\n"));
++       (*body)->nested.part->body.type = TYPETEXT;
++     }
++ 
+      dprint((4, "=== send returning ===\n"));
+  }
+  
+***************
+*** 5365,5386 ****
+  
+  				rfc822_parse_content_header(nb,
+  				    (char *) ucase((unsigned char *) buf+8),s);
+  				if(nb->type == TYPETEXT
+  				   && nb->subtype
+  				   && (!b->subtype 
+  				       || strucmp(b->subtype, nb->subtype))){
+! 				    if(b->subtype)
+! 				      fs_give((void **) &b->subtype);
+! 
+  				    b->subtype  = nb->subtype;
+  				    nb->subtype = NULL;
+! 				      
+  				    mail_free_body_parameter(&b->parameter);
+  				    b->parameter = nb->parameter;
+  				    nb->parameter = NULL;
+  				    mail_free_body_parameter(&nb->parameter);
+  				}
+! 
+  				mail_free_body(&nb);
+  			    }
+  
+--- 5382,5431 ----
+  
+  				rfc822_parse_content_header(nb,
+  				    (char *) ucase((unsigned char *) buf+8),s);
++ 				/* Topal: We're working on the first
++ 				   text segment of the message.  If
++ 				   the filter returns something that
++ 				   isn't TYPETEXT, then we need to
++ 				   pretend (later on) that this is in
++ 				   fact a TYPETEXT, because Topal has
++ 				   already encoded it....
++ 
++ 				   Original code path first, then an
++ 				   alternate path.
++ 				*/
+  				if(nb->type == TYPETEXT
+  				   && nb->subtype
+  				   && (!b->subtype 
+  				       || strucmp(b->subtype, nb->subtype))){
+! 				  if(b->subtype)
+! 				    fs_give((void **) &b->subtype);
+! 				  
+! 				  b->subtype  = nb->subtype;
+! 				  nb->subtype = NULL;
+! 				  
+! 				  mail_free_body_parameter(&b->parameter);
+! 				  b->parameter = nb->parameter;
+! 				  nb->parameter = NULL;
+! 				  mail_free_body_parameter(&nb->parameter);
+! 				} 
+! 				else if(F_ON(F_ENABLE_TOPAL_HACK, ps_global)){
+! 				  /* Perhaps the type isn't TYPETEXT,
+! 				     and the hack is requested.  So,
+! 				     let's mess with the types. */
+! 				  if(nb->type != TYPETEXT){
+! 				    b->type     = nb->type;
+  				    b->subtype  = nb->subtype;
+  				    nb->subtype = NULL;
+! 				    
+! 				    dprint((9, "Topal: mangling body!\n"));
+  				    mail_free_body_parameter(&b->parameter);
+  				    b->parameter = nb->parameter;
+  				    nb->parameter = NULL;
+  				    mail_free_body_parameter(&nb->parameter);
++ 				    b->topal_hack = 1;
++ 				  }
+  				}
+! 				/* Topal: end */
+  				mail_free_body(&nb);
+  			    }
+  
+diff -cr alpine-2.02-orig/imap/src/c-client/mail.h alpine-2.02-p1/imap/src/c-client/mail.h
+*** alpine-2.02-orig/imap/src/c-client/mail.h	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/imap/src/c-client/mail.h	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 775,780 ****
+--- 775,781 ----
+      unsigned long bytes;	/* size of text in octets */
+    } size;
+    char *md5;			/* MD5 checksum */
++   unsigned short topal_hack;    /* set to 1 if topal has wrecked the sending */
+    void *sparep;			/* spare pointer reserved for main program */
+  };
+  
+diff -cr alpine-2.02-orig/pith/conf.c alpine-2.02-p1/pith/conf.c
+*** alpine-2.02-orig/pith/conf.c	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/pith/conf.c	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 2831,2836 ****
+--- 2831,2838 ----
+  	 F_SEND_WO_CONFIRM, h_config_send_wo_confirm, PREF_SEND, 0},
+  	{"strip-whitespace-before-send", "Strip Whitespace Before Sending",
+  	 F_STRIP_WS_BEFORE_SEND, h_config_strip_ws_before_send, PREF_SEND, 0},
++  	{"enable-topal-hack", "Enable Topal hack for OpenPGP/MIME messages",
++  	 F_ENABLE_TOPAL_HACK, h_config_enable_topal_hack, PREF_HIDDEN, 0},
+  	{"warn-if-blank-fcc", "Warn if Blank Fcc",
+  	 F_WARN_ABOUT_NO_FCC, h_config_warn_if_fcc_blank, PREF_SEND, 0},
+  	{"warn-if-blank-subject", "Warn if Blank Subject",
+Only in alpine-2.02-p1/pith: conf.c.orig
+diff -cr alpine-2.02-orig/pith/conftype.h alpine-2.02-p1/pith/conftype.h
+*** alpine-2.02-orig/pith/conftype.h	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/pith/conftype.h	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 503,508 ****
+--- 503,509 ----
+  	F_MARK_FCC_SEEN,
+  	F_MULNEWSRC_HOSTNAMES_AS_TYPED,
+  	F_STRIP_WS_BEFORE_SEND,
++ 	F_ENABLE_TOPAL_HACK,
+  	F_QUELL_FLOWED_TEXT,
+  	F_COMPOSE_ALWAYS_DOWNGRADE,
+  	F_SORT_DEFAULT_FCC_ALPHA,
+diff -cr alpine-2.02-orig/pith/pine.hlp alpine-2.02-p1/pith/pine.hlp
+*** alpine-2.02-orig/pith/pine.hlp	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/pith/pine.hlp	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 3285,3291 ****
+  <li><a href="h_config_always_spell_check">FEATURE: </a>
+  <li><a href="h_config_winpos_in_config">FEATURE: </a>
+  <li><a href="h_config_strip_sigdashes">FEATURE: </a>
+! <li><a href="h_config_strip_ws_before_send">FEATURE: </a>
+  <li><a href="h_config_quells_asterisks">FEATURE: </a>
+  <li><a href="h_config_quell_attach_ext_warn">FEATURE: </a>
+  <li><a href="h_config_quell_attach_extra_prompt">FEATURE: </a>
+--- 3285,3292 ----
+  <li><a href="h_config_always_spell_check">FEATURE: </a>
+  <li><a href="h_config_winpos_in_config">FEATURE: </a>
+  <li><a href="h_config_strip_sigdashes">FEATURE: </a>
+! <li><a href="h_config_strip_ws_before_send">FEATURE: </a> 
+! <li><a href="h_config_enable_topal_hack">FEATURE: </a>
+  <li><a href="h_config_quells_asterisks">FEATURE: </a>
+  <li><a href="h_config_quell_attach_ext_warn">FEATURE: </a>
+  <li><a href="h_config_quell_attach_extra_prompt">FEATURE: </a>
+***************
+*** 28413,28418 ****
+--- 28414,28434 ----
+  <P>
+  &lt;End of help on this topic&gt;
+  </BODY>
++ </HTML>
++ ====== h_config_enable_topal_hack =====
++ <HTML>
++ <HEAD>
++ <TITLE>FEATURE: </TITLE>
++ </HEAD>
++ <BODY>
++ <H1>FEATURE: </H1>
++ <P>
++ This feature allows Topal (and other sending-filters) to change the
++ MIME type of the email.  This is potentially dangerous because it
++ pretends that multipart emails are plain emails.
++ <P>
++ &lt;End of help on this topic&gt;
++ </BODY>
+  </HTML>
+  ====== h_config_del_from_dot =====
+  <HTML>
+Only in alpine-2.02-p1/pith: pine.hlp.orig
+diff -cr alpine-2.02-orig/pith/send.c alpine-2.02-p1/pith/send.c
+*** alpine-2.02-orig/pith/send.c	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p1/pith/send.c	2011-03-23 21:06:47.000000000 +0000
+***************
+*** 107,113 ****
+  int        l_flush_net(int);
+  int        l_putc(int);
+  int	   pine_write_header_line(char *, char *, STORE_S *);

topal-package-76.tgz/alpine-2.02.patch-2 Added

@@ -0,0 +1,45 @@
+diff -cr alpine-2.02-orig/imap/src/c-client/mail.c alpine-2.02-p2/imap/src/c-client/mail.c
+*** alpine-2.02-orig/imap/src/c-client/mail.c	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p2/imap/src/c-client/mail.c	2011-03-23 21:07:05.000000000 +0000
+***************
+*** 2712,2717 ****
+--- 2712,2719 ----
+    BODY *b = NIL;
+    PART *pt;
+    unsigned long i;
++   /* Topal hack 2 */
++   mail_fetchstructure (stream,msgno,&b);
+  				/* make sure have a body */
+    if (section && *section && mail_fetchstructure (stream,msgno,&b) && b)
+      while (*section) {		/* find desired section */
+diff -cr alpine-2.02-orig/pith/mailcap.c alpine-2.02-p2/pith/mailcap.c
+*** alpine-2.02-orig/pith/mailcap.c	2010-10-02 09:37:57.000000000 +0100
+--- alpine-2.02-p2/pith/mailcap.c	2011-03-23 21:07:05.000000000 +0000
+***************
+*** 582,589 ****
+  	 *       typically two scans through the check_extension
+  	 *       mechanism, the mailcap entry now takes precedence.
+  	 */
+! 	if((fname = get_filename_parameter(NULL, 0, body, &e2b.from.ext)) != NULL
+! 	   && e2b.from.ext && e2b.from.ext[0]){
+  	    if(strlen(e2b.from.ext) < sizeof(tmp_ext) - 2){
+  		strncpy(ext = tmp_ext, e2b.from.ext - 1, sizeof(tmp_ext)); /* remember it */
+  		tmp_ext[sizeof(tmp_ext)-1] = '\0';
+--- 582,598 ----
+  	 *       typically two scans through the check_extension
+  	 *       mechanism, the mailcap entry now takes precedence.
+  	 */
+! 	/* Topal hack 2 */
+! 	fname = get_filename_parameter(NULL, 0, body, &e2b.from.ext);
+! 	if (fname == NULL) {
+! 	  if (body->type == TYPEMULTIPART &&
+! 	      ((body->subtype && !strucmp(body->subtype, "signed"))
+! 	       ||(body->subtype && !strucmp(body->subtype, "encrypted"))))
+! 	    fname = cpystr("openpgp.msg");
+! 	}
+! 	
+! 	if(fname != NULL
+!          && e2b.from.ext && e2b.from.ext[0]){
+  	    if(strlen(e2b.from.ext) < sizeof(tmp_ext) - 2){
+  		strncpy(ext = tmp_ext, e2b.from.ext - 1, sizeof(tmp_ext)); /* remember it */
+  		tmp_ext[sizeof(tmp_ext)-1] = '\0';

topal-package-72.tgz/attachments.adb -> topal-package-76.tgz/attachments.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -23,8 +23,6 @@
 
 package body Attachments is
 
-   Attachment_List_Initial_Size : constant Positive := 50;
-
    type Menu_Array_Ptr is access all Attachlist_Menus.MNA;
 
    -- Add an attachment to the list....
@@ -39,16 +37,15 @@
          use type UBS;
       begin
          Debug("Add_Attachment: Approaching duplicates loop");
-         for I in 1..List.Count loop
+         for I in 1..Integer(List.AA.Length) loop
             Debug("Add_Attachment: In duplicates loop");
-            Match := Match or Filename = UAP.Value(List.AA, I);
+            Match := Match or Filename = List.AA.Element(I);
          end loop;
       end;
       if not Match then
          -- Add the attachment.
          Debug("Add_Attachment: Adding an attachment");
-         List.Count := List.Count + 1;
-         UAP.Set(List.AA, List.Count, Filename);
+         List.AA.Append(Filename);
          Debug("Add_Attachment: Done adding an attachment");
       end if;
    exception
@@ -58,27 +55,21 @@
          raise;
    end Add_Attachment;
 
-   -- Remove a key.  We then shuffle the array down.
-   -- It will only remove the last key if there are multiple instances.
+   -- Remove an attachment.
    procedure Remove_Attachment (Filename  : in     UBS;
                                 List      : in out Attachment_List) is
       A_Num : Integer;
       A_Found : Boolean := False;
       use type UBS;
    begin
-      for I in 1..List.Count loop
-         if Filename = UAP.Value(List.AA, I) then
+      for I in 1..Integer(List.AA.Length) loop
+         if Filename = List.AA.Element(I) then
             A_Found := True;
             A_Num := I;
          end if;
       end loop;
       if A_Found then
-         -- Shuffle the array over it.
-         for I in A_Num .. List.Count - 1 loop
-            UAP.Set(List.AA, I, UAP.Value(List.AA, I+1));
-         end loop;
-         -- Reduce the number of keys.
-         List.Count := List.Count - 1;
+	 List.AA.Delete(A_Num);
       else
          raise Attachment_Not_Found;
       end if;
@@ -99,10 +90,10 @@
       begin
          Debug("+Generate_A_List");
          -- Create a menu with the prefix of these attachments.
-         A_Menu := new Attachlist_Menus.MNA(1..List.Count);
-         for I in 1..List.Count loop
+         A_Menu := new Attachlist_Menus.MNA(1..Integer(List.AA.Length));
+         for I in 1..Integer(List.AA.Length) loop
             declare
-               S : constant String := ToStr(UAP.Value(List.AA, I));
+               S : constant String := ToStr(List.AA.Element(I));
             begin
                if S'Length < A_Head_Length then
                   A_Menu(I) := ToUBS(S);
@@ -176,7 +167,7 @@
          else
             -- Remove the given number.
             Selected := Selection.N;
-            Remove_Attachment(UAP.Value(List.AA, Selected),
+            Remove_Attachment(List.AA.Element(Selected),
                               List);
             Generate_A_List;
          end if;
@@ -191,8 +182,7 @@
 
    procedure Empty_Attachment_List (List : in out Attachment_List) is
    begin
-      UAP.Create(List.AA, Attachment_List_Initial_Size);
-      List.Count := 0;
+      List.AA := UVP.Empty_Vector;
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
@@ -202,7 +192,7 @@
 
    function Count (List : in Attachment_List) return Natural is
    begin
-      return List.Count;
+      return Natural(List.AA.Length);
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
@@ -218,14 +208,14 @@
       CT : UBS;
    begin
       -- Do nothing if the attachment list is empty.
-      if List.Count /= 0 then
+      if Integer(List.AA.Length) /= 0 then
          -- Now, construct a list of items.
          AL(1) := ToUBS(Tmpfile);
-         for I in 1..List.Count loop
+         for I in 1..Integer(List.AA.Length) loop
             -- Guess the content type.
-            CT := ToUBS(Externals.Simple.Guess_Content_Type(ToStr(UAP.Value(List.AA, I))) & "; name="""&Basename(ToStr(UAP.Value(List.AA, I)))&"""");
+            CT := ToUBS(Externals.Simple.Guess_Content_Type(ToStr(List.AA.Element(I))) & "; name="""&Basename(ToStr(List.AA.Element(I)))&"""");
             -- Create a base64 subpart.
-            Externals.Mail.Mimeconstruct_Subpart(Infile => ToStr(UAP.Value(List.AA, I)),
+            Externals.Mail.Mimeconstruct_Subpart(Infile => ToStr(List.AA.Element(I)),
                                                  Outfile => BF & Trim_Leading_Spaces(Integer'Image(I)),
                                                  Content_Type => ToStr(CT),
                                                  Dos2UnixU => True,
@@ -233,7 +223,7 @@
                                                  Encoding => "base64");
             -- Add the base64's file to the list.
             AL(I+1) := ToUBS(BF & Trim_Leading_Spaces(Integer'Image(I)));
-            Ada.Text_IO.Put_Line("Added file `"&ToStr(UAP.Value(List.AA, I))&"' with content-type `"&ToStr(CT)&"'");
+            Ada.Text_IO.Put_Line("Added file `"&ToStr(List.AA.Element(I))&"' with content-type `"&ToStr(CT)&"'");
          end loop;
          -- And call mimeconstruct.
          Externals.Mail.Mimeconstruct_Mixed(AL, TF);

topal-package-72.tgz/attachments.ads -> topal-package-76.tgz/attachments.ads Changed

topal-package-72.tgz/configuration.adb -> topal-package-76.tgz/configuration.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -27,6 +27,7 @@
    Binary_Name : constant array(Binaries) of UBS :=
      (Chmod => ToUBS("chmod"),
       Clear => ToUBS("clear"),
+      Cut => ToUBS("cut"),
       Date => ToUBS("date"),
       Diff => ToUBS("diff"),
       File => ToUBS("file"),
@@ -56,8 +57,9 @@
 
    UBS_Opts_Names : constant array (UBS_Opts_Keys) of UBS :=
      (My_Key => ToUBS("my-key"),
-      General_Options => ToUBS("general-options"),
       GPG_Options=> ToUBS("gpg-options"),
+      GPGSM_Options=> ToUBS("gpgsm-options"),
+      General_Options => ToUBS("general-options"),
       Receiving_Options=> ToUBS("receiving-options"),
       Sending_Options => ToUBS("sending-options"),
       Colour_Menu_Title => ToUBS("colour-menu-title"),
@@ -65,7 +67,8 @@
       Colour_Menu_Choice => ToUBS("colour-menu-choice"),
       Colour_Important => ToUBS("colour-important"),
       Colour_Banner => ToUBS("colour-banner"),
-      Colour_Info => ToUBS("colour-info"));
+      Colour_Info => ToUBS("colour-info"),
+      Decrypt_Prereq => ToUBS("decrypt-prereq"));
 
    Positive_Opts_Names : constant array (Positive_Opts_Keys) of UBS :=
      (Decrypt_Not_Cached => ToUBS("decrypt-not-cached"),
@@ -78,7 +81,9 @@
       Verify_Cached_Use_Cache => ToUBS("verify-cached-use-cache"),
       Mime_Viewer_Decrypt => ToUBS("mime-viewer-decrypt"),
       Mime_Viewer_Verify => ToUBS("mime-viewer-verify"),
-      Use_Agent => ToUBS("use-agent"));
+      Use_Agent => ToUBS("use-agent"),
+      Replace_IDs => ToUBS("replace-ids"),
+      Include_Send_Token => ToUBS("include-send-token"));
 
    Boolean_Opts_Names : constant array (Boolean_Opts_Keys) of UBS :=
       (Decrypt_Cached_Fast_Continue => ToUBS("decrypt-cached-fast-continue"),
@@ -90,6 +95,10 @@
        Omit_Inline_Disposition_Header => ToUBS("omit-inline-disposition-header"),
        Save_On_Send => ToUBS("save-on-send"),
        ANSI_Terminal => ToUBS("ansi-terminal"),
+       Wait_If_Missing_Keys => ToUBS("wait-if-missing-keys"),
+       Attachment_Trap => ToUBS("attachment-trap"),
+       Fix_Fcc => ToUBS("fix-fcc"),
+       Fix_Bcc => ToUBS("fix-bcc"),
        Debug => ToUBS("debug"),
        -- The following ones don't really matter, since they won't be used.
        No_Clean => ToUBS("no-clean"),
@@ -247,6 +256,7 @@
                  := ToStr(Misc.Unbounded_Get_Line(CF));
                Name     : UBS;
                Value    : UBS;
+	       K, E     : UBS;
             begin
                if The_Line'Length > 0
                  and then The_Line(The_Line'First) = '#' then
@@ -269,48 +279,28 @@
                         Config.Boolean_Opts(Get_Boolean_Opts_Key(N))
                           := Set_Two_Way(ToStr(V));
                      elsif N = "ake" then
-                        -- Break the up the key,email pair.
-                        declare
-                           K : UBS;
-                           E : UBS;
-                        begin
-                           Parse_AKE(V, K, E);
-                           Config.AKE_Count := Config.AKE_Count + 1;
-                           UAP.Set(Config.AKE_Key, Config.AKE_Count, K);
-                           UAP.Set(Config.AKE_Email, Config.AKE_Count, E);
-                        end;
+			Parse_AKE(V, K, E);
+			Config.AKE.Append(UPC(K, E));
                      elsif N = "xk" then
                         -- This is a key to be excluded.
-                        Config.XK_Count := Config.XK_Count + 1;
-                        UAP.Set(Config.XK_Key, Config.XK_Count, V);
+			Config.XK.Append(V);
                      elsif N = "sake" then
-                        -- Break the up the key,email pair.
-                        declare
-                           K : UBS;
-                           E : UBS;
-                        begin
-                           Parse_AKE(V, K, E);
-                           Config.SAKE_Count := Config.SAKE_Count + 1;
-                           UAP.Set(Config.SAKE_Key, Config.SAKE_Count, K);
-                           UAP.Set(Config.SAKE_Email, Config.SAKE_Count, E);
-                        end;
+			Parse_AKE(V, K, E);
+			Config.SAKE.Append(UP'(K, E));
                      elsif N = "sxk" then
-                        -- This is a key to be excluded.
-                        Config.SXK_Count := Config.SXK_Count + 1;
-                        UAP.Set(Config.SXK_Key, Config.SXK_Count, V);
+			Config.SXK.Append(V);
                      elsif N = "sd" then
-                        -- Break the up the key,mode pair.
-                        declare
-                           K : UBS;
-                           E : UBS;
-                        begin
-                           Parse_AKE(V, K, E);
-                           Config.SD_Count := Config.SD_Count + 1;
-                           UAP.Set(Config.SD_KE, Config.SD_Count, K);
-                           UAP.Set(Config.SD_Mode, Config.SD_Count, E);
-                        end;
+			Parse_AKE(V, K, E);
+			Config.SD.Append(UP'(K, E));
+                     elsif N = "sc" then
+			Parse_AKE(V, K, E);
+			Config.SC.Append(UP'(K, E));
+                     elsif N = "st" then
+			Parse_AKE(V, K, E);
+			Config.ST.Append(UP'(K, E));
                      else
-                        Put_Line("WARNING: Bogus line in configuration file: " & The_Line);
+                        Put_Line(Ada.Text_IO.Standard_Error,
+				 "WARNING: Bogus line in configuration file: " & The_Line);
                         Warnings := True;
                      end if;
                   end;
@@ -380,31 +370,43 @@
                     & "="
                     & ToStr(Two_Way(Config.Boolean_Opts(I))));
       end loop;
-      for I in 1 .. Config.AKE_Count loop
+      for I in 1 .. Integer(Config.AKE.Length) loop
          Put_Line("ake="
-                  & ToStr(UAP.Value(Config.AKE_Key, I))
+                  & ToStr(Config.AKE.Element(I).Key)
                   & ","
-                  & ToStr(UAP.Value(Config.AKE_Email, I)));
+                  & ToStr(Config.AKE.Element(I).Value));
       end loop;
-      for I in 1 .. Config.XK_Count loop
+      for I in 1 .. Integer(Config.XK.Length) loop
          Put_Line("xk="
-                  & ToStr(UAP.Value(Config.XK_Key, I)));
+                  & ToStr(Config.XK.Element(I)));
       end loop;
-      for I in 1 .. Config.SAKE_Count loop
+      for I in 1 .. Integer(Config.SAKE.Length) loop
          Put_Line("sake="
-                  & ToStr(UAP.Value(Config.SAKE_Key, I))
+                  & ToStr(Config.SAKE.Element(I).Key)
                   & ","
-                  & ToStr(UAP.Value(Config.SAKE_Email, I)));
+                  & ToStr(Config.SAKE.Element(I).Value));
       end loop;
-      for I in 1 .. Config.SXK_Count loop
+      for I in 1 .. Integer(Config.SXK.Length) loop
          Put_Line("sxk="
-                  & ToStr(UAP.Value(Config.SXK_Key, I)));
+                  & ToStr(Config.SXK.Element(I)));
       end loop;
-      for I in 1 .. Config.SD_Count loop
+      for I in 1 .. Integer(Config.SD.Length) loop
          Put_Line("sd="
-                  & ToStr(UAP.Value(Config.SD_KE, I))
+                  & ToStr(Config.SD.Element(I).Key)
+                  & ","
+                  & ToStr(Config.SD.Element(I).Value));
+      end loop;
+      for I in 1 .. Integer(Config.SC.Length) loop
+         Put_Line("sc="
+                  & ToStr(Config.SC.Element(I).Key)
+                  & ","
+                  & ToStr(Config.SC.Element(I).Value));
+      end loop;
+      for I in 1 .. Integer(Config.ST.Length) loop
+         Put_Line("st="
+                  & ToStr(Config.ST.Element(I).Key)
                   & ","
-                  & ToStr(UAP.Value(Config.SD_Mode, I)));
+                  & ToStr(Config.ST.Element(I).Value));
       end loop;
       if Overwrite_Config then
          Set_Output(Standard_Output);
@@ -418,7 +420,7 @@
          raise;
    end Dump;
 
-   procedure Edit_Own_Key is
+   procedure Edit_Own_Key(SMIME : in Boolean) is
       use Ada.Text_IO;
    begin
       New_Line(2);
@@ -434,7 +436,7 @@
             New_Secret_Key : UBS;
             Use_Old_Key    : Boolean;

topal-package-72.tgz/configuration.ads -> topal-package-76.tgz/configuration.ads Changed

topal-package-76.tgz/cygwin.patch Added

@@ -0,0 +1,130 @@
+diff -cr topal-63.orig/Makefile topal-63.cyg/Makefile
+*** topal-63.orig/Makefile	Sun Aug 31 16:28:25 2008
+--- topal-63.cyg/Makefile	Wed Sep  3 08:06:11 2008
+***************
+*** 83,89 ****
+  	./mkhelp
+  
+  README.txt:	README.html
+! 	lynx -dont_wrap_pre -dump README.html > README.txt
+  
+  install:	all
+  	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
+--- 83,89 ----
+  	./mkhelp
+  
+  README.txt:	README.html
+! 	-lynx -dont_wrap_pre -dump README.html > README.txt
+  
+  install:	all
+  	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
+***************
+*** 102,107 ****
+--- 102,108 ----
+  
+  distclean realclean:	clean
+  	-rm topal topal.gz topal.gz.asc topal-ps topal-ps.gz topal-ps.gz.asc README.txt topal-package*.{tgz,tgz.sig,tgz.asc} *~
++ 	-rm topal.exe
+  	-rm -rf www www.bak
+  	make -C MIME-tool realclean
+  
+diff -cr topal-63.orig/misc.adb topal-63.cyg/misc.adb
+*** topal-63.orig/misc.adb	Sun Aug 31 16:28:25 2008
+--- topal-63.cyg/misc.adb	Wed Sep  3 07:59:31 2008
+***************
+*** 16,23 ****
+  with Ada.Characters.Latin_1;
+  with Ada.Command_Line;
+  with Ada.Integer_Text_IO;
+- with Ada.Interrupts;
+- with Ada.Interrupts.Names;
+  with Ada.IO_Exceptions;
+  with Ada.Strings;
+  with Ada.Strings.Fixed;
+--- 16,21 ----
+***************
+*** 496,523 ****
+           raise;
+     end Hex_Decode;
+  
+-    -- Handle signals.
+-    Default_Sigint_Handler : Ada.Interrupts.Parameterless_Handler;
+-    protected body Signal_Handlers is
+- 
+-       procedure Sigint_Handler is
+-       begin
+-          Ada.Text_IO.Put_Line("User interrupt!");
+-          Sigint_Pending_Flag := True;
+-          raise User_Interrupt;
+-       end Sigint_Handler;
+- 
+-       function Sigint_Pending return Boolean is
+-       begin
+-          return Sigint_Pending_Flag;
+-       end Sigint_Pending;
+- 
+-    end Signal_Handlers;
+- 
+     procedure Set_Sigint_Handler is
+     begin
+!       Ada.Interrupts.Attach_Handler(Signal_Handlers.Sigint_Handler'Access,
+!                                     Ada.Interrupts.Names.SIGINT);
+     exception
+        when others =>
+           Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+--- 494,502 ----
+           raise;
+     end Hex_Decode;
+  
+     procedure Set_Sigint_Handler is
+     begin
+!       null;
+     exception
+        when others =>
+           Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+***************
+*** 525,530 ****
+           raise;
+     end Set_Sigint_Handler;
+  
+- begin
+-    Default_Sigint_Handler := Ada.Interrupts.Current_Handler(Ada.Interrupts.Names.SIGINT);
+  end Misc;
+--- 504,507 ----
+diff -cr topal-63.orig/misc.ads topal-63.cyg/misc.ads
+*** topal-63.orig/misc.ads	Sun Aug 31 16:28:25 2008
+--- topal-63.cyg/misc.ads	Wed Sep  3 07:59:42 2008
+***************
+*** 96,113 ****
+     -- Hexadecimal decoder.
+     function Hex_Decode (S : in String) return Natural;
+  
+-    -- We turn SIGINT into an exception so that we can clean up
+-    --  temporary files.
+-    -- Handle interrupts, SIGINT, etc.
+-    pragma Unreserve_All_Interrupts;
+-    -- because we want to be able to handle ctrl-C.
+-    protected Signal_Handlers is
+-       procedure Sigint_Handler;
+-       function Sigint_Pending return Boolean;
+-       pragma Interrupt_Handler(Sigint_Handler);
+-    private
+-       Sigint_Pending_Flag : Boolean := False;
+-    end Signal_Handlers;
+     -- And a procedure for taking over sigint.
+     procedure Set_Sigint_Handler;
+  
+--- 96,101 ----
+diff -cr topal-63.orig/remote_mode.adb topal-63.cyg/remote_mode.adb
+*** topal-63.orig/remote_mode.adb	Sun Aug 31 16:28:25 2008
+--- topal-63.cyg/remote_mode.adb	Wed Sep  3 08:02:32 2008
+***************
+*** 382,388 ****
+       Server_Trigger_Loop:
+           loop
+              exit Server_Trigger_Loop when Test_F(Server_Trigger);
+-             exit Server_Main_Loop when Misc.Signal_Handlers.Sigint_Pending;
+              delay 0.5;
+           end loop Server_Trigger_Loop;
+           delay 0.1;
+--- 382,387 ----

topal-package-72.tgz/echo.adb -> topal-package-76.tgz/echo.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -60,5 +60,39 @@
                               "Exception raised in Echo.Clear_Echo");
          raise;
    end Clear_Echo;
+   
+   function C_Save_Terminal return Interfaces.C.int;
 
+   pragma Import(C, C_Save_Terminal, "saveTerminal");
+
+   function C_Restore_Terminal return Interfaces.C.int;
+
+   pragma Import(C, C_Restore_Terminal, "restoreTerminal");
+
+   procedure Save_Terminal is
+      Result : Interfaces.C.Int;
+      pragma Unreferenced(Result);
+      use type Interfaces.C.Int;
+   begin
+      Result := C_Save_Terminal;
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Echo.Save_Terminal");
+         raise;
+   end Save_Terminal;
+   
+   procedure Restore_Terminal is
+      Result : Interfaces.C.Int;
+      pragma Unreferenced(Result);
+      use type Interfaces.C.Int;
+   begin
+      Result := C_Restore_Terminal;
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Echo.Restore_Terminal");
+         raise;
+   end Restore_Terminal;
+   
 end Echo;

topal-package-72.tgz/echo.ads -> topal-package-76.tgz/echo.ads Changed

topal-package-72.tgz/externals-gpg.adb -> topal-package-76.tgz/externals-gpg.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -14,11 +14,70 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 with Ada.Text_IO;
+with Externals.Mail;
 with Externals.Simple;
+with Menus;
 with Misc;             use Misc;
 
 package body Externals.GPG is
-
+   
+   type G_Modes is (OpenPGP, OPsend, OPreceive, S_MIME);
+   
+   function G_Command(GM : G_Modes) return UBS is
+   begin
+      case GM is
+	 when OpenPGP | OPsend | OPreceive =>
+	    return Value_Nonempty(Config.Binary(GPGOP));
+	 when S_MIME =>
+	    return Value_Nonempty(Config.Binary(GPGSM));
+      end case;
+   end G_Command;
+   
+   function G_Command(GM : G_Modes) return String is
+   begin
+      return ToStr(G_Command(GM));
+   end G_Command;
+   
+   function G_Name(GM : G_Modes) return String is
+   begin
+      case GM is
+	 when OpenPGP | OPsend | OPreceive =>
+	    return "gpg";
+	 when S_MIME =>
+	    return "gpgsm";
+      end case;
+   end G_Name;
+   
+   -- No need for the G_Name ... return UBS variant.  Omitted.
+   
+   function G_Options(GM : G_Modes) return UBS is
+      use type UBS;
+   begin
+      case GM is
+	 when S_MIME =>
+	    return Config.UBS_Opts(GPGSM_Options);
+	 when OpenPGP =>
+	    return Config.UBS_Opts(Gpg_Options);
+	 when OPsend =>	    
+	    return Config.UBS_Opts(Sending_Options)
+	      & " "
+	      & Config.UBS_Opts(General_Options)
+	      & " "
+	      & Config.UBS_Opts(Gpg_Options);
+	 when OPreceive =>
+	    return Config.UBS_Opts(Receiving_Options)
+	      & " "
+	      & Config.UBS_Opts(General_Options)
+	      & " "
+	      & Config.UBS_Opts(Gpg_Options);
+      end case;
+   end G_Options;
+   
+   function G_Options(GM : G_Modes) return String is
+   begin
+      return ToStr(G_Options(GM));
+   end G_Options;
+   
    procedure Clean_GPG_Errors (Orig_Err_File : in String;
                                Err_File      : in String) is
    begin
@@ -34,23 +93,24 @@
       end if;
    end Clean_GPG_Errors;
 
-   function GPG_Tee (Input_File  : String;
-                     Output_File : String;
-                     Err_File    : String) return Integer is
+   function GPG_Tee (Input_File      : String;
+                     Output_File     : String;
+                     Err_File        : String;
+		     Status_Filename : String) return Integer is
       GPG_Return_Value, Tee_Return_Value : Integer;
       Orig_Err_File                      : constant String
         := Temp_File_Name("origerr");
+      SFD                                : Integer;
    begin
-      ForkExec2(Value_Nonempty(Config.Binary(GPGOP)),
-                ToUBS("gpg "
-                      & ToStr(Config.UBS_Opts(Gpg_Options))
+      SFD := Open_Out(Status_Filename);
+      ForkExec2(G_Command(OPreceive),
+                ToUBS("gpg --status-fd " 
+			& Integer'Image(SFD)
+			& " "
+                      & G_Options(OPreceive)
                       & " --output "
                       & Output_File
                       & " "
-                      & ToStr(Config.UBS_Opts(General_Options))
-                      & " "
-                      & ToStr(Config.UBS_Opts(Receiving_Options))
-                      & " "
                       & UGA_Str(Signing => False)
                       & " "
                       & Input_File),
@@ -64,6 +124,7 @@
       if Tee_Return_Value /= 0 then
          Error("Tee failed! (ff1)");
       end if;
+      CClose(SFD);
       Clean_GPG_Errors(Orig_Err_File, Err_File);
       -- Let the caller sort out the GPG return value.
       return GPG_Return_Value;
@@ -74,23 +135,73 @@
          raise;
    end GPG_Tee;
 
-   function GPG_Verify_Tee (Input_File  : String;
-                            Sig_File    : String;
-                            Output_File : String;
-                            Err_File    : String) return Integer is
+   function GPGSM_Tee (Input_File      : String;
+		       Output_File     : String;
+		       Err_File        : String;
+		       Encoding_Arg    : String;
+		       Status_Filename : String;
+		       Verify          : Boolean) return Integer is
       GPG_Return_Value, Tee_Return_Value : Integer;
       Orig_Err_File                      : constant String
         := Temp_File_Name("origerr");
+      SFD                                : Integer;
+      Op_String : constant array (Boolean) of String(1..11)
+	:= (True  => " --verify  ",
+	    False => " --decrypt ");
    begin
-      ForkExec2(Value_Nonempty(Config.Binary(GPGOP)),
-                ToUBS("gpg "
-                      & ToStr(Config.UBS_Opts(Gpg_Options))
+      SFD := Open_Out(Status_Filename);
+      ForkExec2(G_Command(S_MIME),
+                ToUBS("gpgsm --status-fd " 
+			& Integer'Image(SFD)
+			& " "
+			& G_Options(S_MIME)
+			& " "
+		      & Encoding_Arg
+			-- Not using --assume-base64 because Pine
+			--  appears to unwrap the message into binary.
+                      & " --output " 
+                      & Output_File
+                      & Op_String(Verify)
+                      & Input_File),
+                GPG_Return_Value,
+                Value_Nonempty(Config.Binary(Tee)),
+                ToUBS("tee "
+                      & Orig_Err_File),
+                Tee_Return_Value,
+                Merge_StdErr1 => True,
+                Report => True);
+      if Tee_Return_Value /= 0 then
+         Error("Tee failed! (ff1)");
+      end if;
+      CClose(SFD);
+      Clean_GPG_Errors(Orig_Err_File, Err_File);
+      -- Let the caller sort out the GPG return value.
+      return GPG_Return_Value;
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.GPG.GPGSM_Tee");
+         raise;
+   end GPGSM_Tee;
+
+   function GPG_Verify_Tee (Input_File      : String;
+                            Sig_File        : String;
+                            Output_File     : String;
+                            Err_File        : String;
+			    Status_Filename : String) return Integer is
+      GPG_Return_Value, Tee_Return_Value : Integer;
+      Orig_Err_File                      : constant String
+        := Temp_File_Name("origerr");
+      SFD : Integer;
+   begin
+      SFD := Open_Out(Status_Filename);
+      ForkExec2(G_Command(OpenPGP),
+                ToUBS("gpg --status-fd " 
+			& Integer'Image(SFD)
+			& " "
+			& G_Options(OPreceive)
                       & " --output "
                       & Output_File

topal-package-72.tgz/externals-gpg.ads -> topal-package-76.tgz/externals-gpg.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -13,58 +13,97 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+with Keys;
+
 package Externals.GPG is
 
    -- This returns the return value of GPG.
    -- This function also cleans up the error file to remove
    -- `gpg: Invalid passphrase; please try again ...' messages.
    -- ONLY USED FOR RECEIVING!
-   function GPG_Tee (Input_File  : String;
-                     Output_File : String;
-                     Err_File    : String) return Integer;
+   function GPG_Tee (Input_File      : String;
+                     Output_File     : String;
+                     Err_File        : String;
+		     Status_Filename : String) return Integer;
+   function GPGSM_Tee (Input_File      : String;
+		       Output_File     : String;
+		       Err_File        : String;
+		       Encoding_Arg    : String;
+		       Status_Filename : String;
+		       Verify          : Boolean) return Integer;
 
    -- This returns the return value of GPG.
    -- This function also cleans up the error file to remove
    -- `gpg: Invalid passphrase; please try again ...' messages.
    -- ONLY USED FOR RECEIVING (VERIFYING)!
-   function GPG_Verify_Tee (Input_File  : String;
-                            Sig_File    : String;
-                            Output_File : String;
-                            Err_File    : String) return Integer;
-   function GPGSM_Verify_Tee (Input_File  : String;
-                              Sig_File    : String;
-                              Output_File : String;
-                              Err_File    : String) return Integer;
+   function GPG_Verify_Tee (Input_File      : String;
+                            Sig_File        : String;
+                            Output_File     : String;
+                            Err_File        : String;
+			    Status_Filename : String) return Integer;
+   function GPGSM_Verify_Tee (Input_File      : String;
+                              Sig_File        : String;
+                              Output_File     : String;
+                              Err_File        : String;
+			      Status_Filename : String) return Integer;
 
    -- Determine the Micalg code from a file.
    Unrecognised_Micalg : exception;
-
+   
+   -- From the actual signature file.
    function Micalg_From_Filename (Sigfile : in String) return String;
+   -- From the status-fd output.
+   function Micalg_From_Status (Status_Filename : in String) return String;
+   
+   -- Search for Code in a status-fd file.
+   function Grep_Status (Status_Filename : String;
+			 Code            : String) return Boolean;
 
    -- Wrapper for GPG sending.
    GPG_Failed          : exception;
 
-   -- The args should for GPG should be complete (except for the leading
-   -- gpg).  The Out_Filename is for checking for the existence of an
-   -- output file.
+   -- The args should for GPG should be complete (except for the
+   --  leading gpg).  The Out_Filename is for checking for the
+   --  existence of an output file.  Status_Filename is where GnuPG's
+   --  --status-fd output should be directed.
    -- ONLY USED FOR SENDING!
-   procedure GPG_Wrap (Args         : in String;
-                       Out_Filename : in String);
-
+   procedure GPG_Wrap (Args            : in String;
+                       Out_Filename    : in String;
+		       Status_Filename : in String);
+   procedure GPGSM_Wrap (Args            : in String;
+			 Out_Filename    : in String;
+			 Status_Filename : in String;
+			 No_Exception    : in Boolean := False);
+   
+   -- A variant of GPGSM_Wrap.  We use this to allow us to fallback to
+   --  using OpenSSL if GPGSM is whinging about unusable keys.
+   procedure GPGSM_Wrap_Encrypt (Out_Filename    : in String;
+				 Status_Filename : in String;
+				 In_Filename     : in String;
+				 Send_Keys       : in Keys.Key_List);
+   
    -- Find a given key(s); dump into the Target filename.
    procedure Findkey (Key    : in String;
-                      Target : in String);
+                      Target : in String;
+		      SMIME  : in Boolean);
 
    -- Find a given secret key(s); dump into the Target filename.
    procedure Findkey_Secret (Key    : in String;
-                             Target : in String);
+                             Target : in String;
+			     SMIME  : in Boolean);
 
    -- List the details of a given key(s); dump into the Target filename.
    procedure Listkey (Key    : in String;
-                      Target : in String);
+                      Target : in String;
+		      SMIME  : in Boolean);
 
    -- View (with a pager) the given key(s); optionally verbosely.
    procedure Viewkey (Key     : in String;
-                      Verbose : in Boolean := False);
-
+                      Verbose : in Boolean;
+		      SMIME   : in Boolean);
+   
+   -- Extract the uid's from a gpgsm -k $key.
+   procedure Brief_View_SMIME_Key (Key    : in String;
+				   Target : in String);
+     
 end Externals.GPG;

topal-package-72.tgz/externals-mail.adb -> topal-package-76.tgz/externals-mail.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -18,6 +18,7 @@
 with Ada.Numerics.Discrete_Random;
 with Ada.Strings.Fixed;
 with Ada.Strings.Maps.Constants;
+with Ada.Strings.Unbounded;
 with Ada.Text_IO;
 with Externals.Mail;
 with Externals.Simple;
@@ -196,6 +197,117 @@
          raise;
    end Split_Two_Parts;
 
+   procedure Get_First_Part (-- Input file.
+			     Infile : in String;
+			     -- Outputs:
+			     -- 1. Prolog (file).
+			     Prolog : in String;
+			     -- 2. Boundary detected (including leading --).
+			     Boundary : out UBS;
+			     -- 3. Part header (file).
+			     Part_Hdr : in String;
+			     -- 4. Part body (file).  Neither 3 nor 4 includes the blank line separator.
+			     Part_Body : in String;
+			     -- 5. Rest of file (including boundary between 4 and this) (file).
+			     Remainder : in String
+			    ) is
+      -- We're expecting a file from DTBL output.
+      -- This is the body of a Pine multipart/mixed.
+      -- We can get the first boundary line by searching for the first -- prefixed line.
+      Infile_F   : Ada.Text_IO.File_Type;
+      Out_F1     : Character_IO.File_Type;
+      Out_F3     : Character_IO.File_Type;
+      Out_F4     : Character_IO.File_Type;
+      Out_F5     : Character_IO.File_Type;
+      L          : UBS;
+   begin
+      -- Open files....
+      begin
+         Ada.Text_IO.Open(File => Infile_F,
+                          Mode => Ada.Text_IO.In_File,
+                          Name => Infile);
+         Character_IO.Create(File => Out_F1,
+                            Mode => Character_IO.Out_File,
+                            Name => Prolog);
+         Character_IO.Create(File => Out_F3,
+                            Mode => Character_IO.Out_File,
+                            Name => Part_Hdr);
+         Character_IO.Create(File => Out_F4,
+                            Mode => Character_IO.Out_File,
+                            Name => Part_Body);
+         Character_IO.Create(File => Out_F5,
+                            Mode => Character_IO.Out_File,
+                            Name => Remainder);
+      exception
+         when others =>
+            Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                                 "Exception raised in Externals.Mail.Get_First_Part (Opening files)");
+            raise;
+      end;
+  Find_Boundary:
+      loop
+	 L := Unbounded_Get_Line(Infile_F);
+	 declare
+	    L2 : constant String := ToStr(L);
+	 begin
+	    if L2'Length > 2
+	      and then L2(1..2) = "--" then
+	       Boundary := L;
+	       exit Find_Boundary;
+	    end if;
+	    -- Otherwise, it's part of the prolog.
+	    Character_IO_Put_Line(Out_F1, ToStr(L));
+	 end;
+      end loop Find_Boundary;
+      -- Write out the boundary we just read to the end of the prolog.
+      Character_IO_Put_Line(Out_F1, ToStr(L));
+      Character_IO.Close(Out_F1);
+      -- We've now got the boundary.  Find a blank line.
+  Find_Blank_Line:
+      loop
+	 L := Unbounded_Get_Line(Infile_F);
+	 declare
+	    L2 : constant String := ToStr(L);
+	 begin
+	    exit when L2'Length = 0;
+	    -- Otherwise, it's part of the part header.
+	    Character_IO_Put_Line(Out_F3, ToStr(L));
+	 end;
+      end loop Find_Blank_Line;
+      Character_IO.Close(Out_F3);
+      -- Now we've got a blank line.  Everything up to the next
+      --  boundary is the part body.
+  Find_Next_Boundary:
+      loop
+	 L := Unbounded_Get_Line(Infile_F);
+	 declare
+	    L2 : constant String := ToStr(L);
+	 begin
+	    exit when L2 = ToStr(Boundary);
+	    -- Otherwise, it's part of the part header.
+	    Character_IO_Put_Line(Out_F4, ToStr(L));
+	 end;
+      end loop Find_Next_Boundary;
+      Character_IO.Close(Out_F4);
+      -- Write out the boundary we just read, and then the rest of the file.
+      Character_IO_Put_Line(Out_F5, ToStr(L));
+  Eat_Remainder:
+      loop
+	 exit when Ada.Text_IO.End_Of_File(Infile_F);
+	 L := Unbounded_Get_Line(Infile_F);
+	 Character_IO_Put_Line(Out_F5, ToStr(L));
+      end loop Eat_Remainder;
+      -- Done, close the last files.
+      Character_IO.Close(Out_F5);
+      Ada.Text_IO.Close(Infile_F);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Mail.Get_First_Part");
+         raise;
+   end Get_First_Part;      
+   
+   
    procedure Extract_Content_Type_From_Header (Email_Filename  : in String;
                                                Target_Filename : in String;
                                                Ignore_Missing  : in Boolean := False;
@@ -225,7 +337,7 @@
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Externals.Mail.Extract_Content_Type_From_Header");
+                              "Exception raised in Externals.Mail.Extract_Content_Type_From_Header (Email_Filename=" & Email_Filename & ", Target_Filename=" & Target_Filename & ")");
          raise;
    end Extract_Content_Type_From_Header;
 
@@ -331,7 +443,58 @@
                               "Exception raised in Externals.Mail.Delete_Trailing_Blank_Lines");
          raise;
    end Delete_Trailing_Blank_Lines;
+   
+   -- A temporary file that we'll re-use for cleaning email addresses.
+   Clean_Email_Tempfile : UBS;
+   procedure Clean_Email_Address (F : in String) is
+      use Ada.Strings.Unbounded;
+      E1, E2 : Integer;
+   begin
+      if Clean_Email_Tempfile = Null_Unbounded_String then
+	 Clean_Email_Tempfile := ToUBS(Temp_File_Name("cleane"));
+      end if;
+      ForkExec2_InOut(Misc.Value_Nonempty(Config.Binary(Sed)),
+		      UBS_Array'(0 => ToUBS("sed"),
+				 1 => ToUBS("s/""[^""]*""//g; s/,/\n/g")),
+		      E1,
+		      Misc.Value_Nonempty(Config.Binary(Sed)),
+		      UBS_Array'(0 => ToUBS("sed"),
+				 1 => ToUBS("s/^.*<//; s/>.*$//; s/ *//g; s/,/\n/g")),
+		      E2,
+		      F,
+		      ToStr(Clean_Email_Tempfile));
+      Externals.Simple.Mv_F(ToStr(Clean_Email_Tempfile), F);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Mail.Clean_Email_address (procedure)");
+         raise;
+   end Clean_Email_Address;
 
+   function Clean_Email_Address (E : in String) return String is
+      L, R : Natural;
+      use Ada.Strings.Fixed;
+   begin
+      L := Index(E, "<");
+      R := Index(E, ">");
+      if L = 0 then 
+	 L := E'First; 
+      else
+	 L := L + 1;
+      end if;
+      if R = 0 then 
+	 R := E'Last; 
+      else
+	 R := R - 1;
+      end if;
+      return E(L..R);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Mail.Clean_Email_address (function)");
+         raise;
+   end Clean_Email_Address;
+   
    procedure Formail_Concat_Extract_InOut (Header : in String;
                                            Source : in String;

topal-package-72.tgz/externals-mail.ads -> topal-package-76.tgz/externals-mail.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -24,6 +24,15 @@
                               Part_One : in String;
                               Part_Two : in String;
                               Boundary : in UBS);
+   
+   -- Given a file, guess the boundary, then eat write the first part
+   --  only into the given target.  See detailed notes in .adb file.
+   procedure Get_First_Part (Infile : in String;
+			     Prolog : in String;
+			     Boundary : out UBS;
+			     Part_Hdr : in String;
+			     Part_Body : in String;
+			     Remainder : in String);
 
    -- Extract a content-type from the header of a header-body mail into a
    -- file.
@@ -48,6 +57,11 @@
 
    procedure Delete_Trailing_Blank_Lines (Infile  : in String;
                                           Outfile : in String);
+   
+   -- Clean up an email address in a file.
+   procedure Clean_Email_Address (F : in String);
+   -- Or string-to-string.
+   function Clean_Email_Address (E : in String) return String;
 
    procedure Formail_Concat_Extract_InOut (Header : in String;
                                            Source : in String;
@@ -61,6 +75,14 @@
    procedure Formail_Action_InOut (Source : in String;
                                    Target : in String;
                                    Action : in String);
+   
+   -- Runs formail -I Header
+   procedure Formail_Replace_Header_InOut (Source : in String;
+					   Target : in String;
+					   Header : in String);
+   procedure Formail_Replace_Header (File   : in String;
+				     Header : in String);
+   
 
    -- Construct a top-level 2 part MIME email.
    procedure Mimeconstruct2 (Part1_Filename  : in String;
@@ -95,5 +117,33 @@
 
    -- Quoted-printable decode from infile to outfile.
    procedure QP_Decode (Infile, Outfile : in String);
+   
+   -- Return hash of file.
+   function Hash_SHA1 (Infile : in String) return String;
+      
+   -- Replace message-id or content-id....
+   procedure Replace_Message_ID(Hdrfile  : in String;
+				Alt_Sign : in String;
+			        Encrypt_Message_ID : in Boolean;
+			        Encrypt_Key : in String);
+   procedure Replace_Content_IDs(Tmpfile  : in String;
+				 Alt_Sign : in String);
+   
+   -- Calculate a token for an X-Topal-Send-Token header.
+   function Calculate_Send_Token(Hdrfile        : in String;
+				 Per_User_Token : in String) return String;
+   
+   -- Filter an email.  Write an X-Topal-Check-Send-Token header, Yes or No.
+   -- Only call this if procmail reports that the user matches (in
+   --  From:) and that there is an X-Topal-Send-Token header.
+   procedure Check_Send_Token(Per_User_Token : in String);
+   
+   -- Encrypt any X-Topal-Fcc headers and replace with X-Topal-Fcce
+   procedure Replace_Fcc(Hdrfile     : in String;
+			 Encrypt_Key : in String);
+   
+   -- Add an encrypted X-Topal-Bcc header if there's a Bcc header.
+   procedure Add_Bcc(Hdrfile     : in String;
+		     Encrypt_Key : in String);
 
 end Externals.Mail;

topal-package-72.tgz/externals-ops.adb -> topal-package-76.tgz/externals-ops.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -51,4 +51,36 @@
          raise;
    end Get_MD5Sum_Of_File;
 
+   function Test_Decrypt_Prerequisite return Integer is
+   begin
+      return ForkExec(ToStr(Config.UBS_Opts(Decrypt_Prereq)),
+                      Config.UBS_Opts(Decrypt_Prereq));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Ops.Test_Decrypt_Prequisite");
+         raise;
+   end Test_Decrypt_Prerequisite;
+
+   procedure Open_TTY is
+      TTY_FD : Integer;
+   begin
+      CClose(0);
+      CClose(1);
+      CClose(2);
+      TTY_FD := Open_In("/dev/tty");
+      Dup2(TTY_FD, 0);
+      TTY_FD := Open_Out("/dev/tty");
+      Dup2(TTY_FD, 1);
+      Dup2(TTY_FD, 2);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Ops.Open_TTY");
+         raise;
+   end Open_TTY;
+
+
+
+
 end Externals.Ops;

topal-package-72.tgz/externals-ops.ads -> topal-package-76.tgz/externals-ops.ads Changed

topal-package-72.tgz/externals-simple.adb -> topal-package-76.tgz/externals-simple.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -442,11 +442,26 @@
 
    function Grep_I_InOut (T : in String;
                           D1 : in String;
-                          D2 : in String) return Integer is
-   begin
+                          D2 : in String;
+			  E  : in Boolean := False;
+			  C  : in Boolean := False) return Integer is
+      F : UBS;
+   begin
+      if E then
+	 F := ToUBS("-iE");
+      else 
+	 F := ToUBS("-i");
+      end if;
+      if C then
+	 declare
+	    use type UBS;
+	 begin
+	    F := F & 'c';
+	 end;
+      end if;
       return ForkExec_InOut(Misc.Value_Nonempty(Config.Binary(Grep)),
                             UBS_Array'(0 => ToUBS("grep"),
-                                 1 => ToUBS("-i"),
+				       1 => F,
                                        2 => ToUBS(T)),
                             Source => D1,
                             Target => D2);
@@ -698,9 +713,9 @@
       First_Line : UBS;
    begin
       ForkExec2_Out(File1 => Value_Nonempty(Config.Binary(File)),
-                    Argv1 => ToUBS("file "
-                                   & " -bi "
-                                   & F),
+                    Argv1 => UBS_Array'(0 => ToUBS("file"),
+                                        1 => ToUBS("-bi"),
+                                        2 => ToUBS(F)),
                     Exit1 => E1,
                     File2 => Value_Nonempty(Config.Binary(Sed)),
                     Argv2 => UBS_Array'(0 => ToUBS("sed"),
@@ -786,7 +801,7 @@
    end Convert_Charmap;
 
    -- Equivalent of `system'.
-   function System (Argv : in UBS) return Integer is
+   function System (Argv : UBS) return Integer is
       A : constant UBS_Array := Misc.Split_Arguments(Argv);
    begin
       return ForkExec(ToStr(A(A'First)), Argv);
@@ -797,7 +812,7 @@
          raise;
    end System;
 
-   function System (Argv : in String) return Integer is
+   function System (Argv : String) return Integer is
    begin
       return System(ToUBS(Argv));
    exception
@@ -807,4 +822,15 @@
          raise;
    end System;
 
+   function System_In (Argv : String; Source : String) return Integer is
+      A : constant UBS_Array := Misc.Split_Arguments(ToUBS(Argv));
+   begin
+      return ForkExec_In(ToStr(A(A'First)), A, Source);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Simple.System_In (Argv=‘" & Argv & "’, Source=‘" & Source & "’");
+	 raise;
+   end System_In;
+
 end Externals.Simple;

topal-package-72.tgz/externals-simple.ads -> topal-package-76.tgz/externals-simple.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -73,9 +73,13 @@
                          D : in String);
 
    -- Equivalent of `grep -i T <D1 >D2'.
+   -- If E is True, then add -E flag (extended regexp).
+   -- If C is True, then add -c flag (return count).
    function Grep_I_InOut (T : in String;
                           D1 : in String;
-                          D2 : in String) return Integer;
+                          D2 : in String;
+			  E : in Boolean := False;
+			  C : in Boolean := False) return Integer;
 
    -- Equivalent of `mkdir -p D'
    procedure Mkdir_P (D : in String);
@@ -108,8 +112,10 @@
    procedure Stty_Sane;
 
    -- Equivalent of `system'.
-   function System (Argv : in UBS) return Integer;
-   function System (Argv : in String) return Integer;
+   -- _In variant sets up stdin from Source.
+   function System (Argv : UBS) return Integer;
+   function System (Argv : String) return Integer;
+   function System_In (Argv : String; Source : String) return Integer;
 
    -- Equivalent of `test -d D'
    function Test_D (D : in String) return Boolean;

topal-package-72.tgz/externals.adb -> topal-package-76.tgz/externals.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -13,8 +13,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-with Ada.Strings.Unbounded;
 with Ada.Text_IO;
+with GNAT.OS_Lib;
 with Interfaces.C;
 with Interfaces.C.Strings;
 with Misc;
@@ -23,41 +23,12 @@
 
    pragma Linker_Options("externals-c.o");
 
-   -- Get an environment variable.
-   function C_Get_Env (Name : Interfaces.C.Char_Array)
-                       return Interfaces.C.Strings.Chars_Ptr;
-   pragma Import(C, C_Get_Env, "getenv");
-
-   procedure C_Set_Env (Name      : Interfaces.C.Char_Array;
-                        Value     : Interfaces.C.Char_Array;
-                        Overwrite : Interfaces.C.Int);
-   pragma Import(C, C_Set_Env, "setenv");
-   pragma Unreferenced(C_Set_Env);
-
    procedure C_Perror (S : in Interfaces.C.char_array);
    pragma Import(C, C_Perror, "perror");
 
    function C_Errno return Interfaces.C.Int;
    pragma Import(C, C_Errno, "errno_wrapper");
 
-   -- Get an environment variable.
-   function Get_Env (Name : String) return String is
-      C_Result : constant Interfaces.C.Strings.Chars_Ptr
-               := C_Get_Env(Interfaces.C.To_C(Name));
-      Result   : UBS;
-   begin
-      Result := ToUBS(Interfaces.C.Strings.Value(C_Result));
-      if Ada.Strings.Unbounded.Length(Result) = 0 then
-         raise No_Such_Environment_Variable;
-      end if;
-      return ToStr(Result);
-   exception
-      when others =>
-         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
-                              "Exception raised in Externals.Get_Env");
-         raise;
-   end Get_Env;
-
    function C_Glob_Actual (Pattern : in Interfaces.C.Char_Array)
      return Interfaces.C.Int;
    pragma Import(C, C_Glob_Actual, "glob_actual");
@@ -147,6 +118,19 @@
       end loop;
       -- Last item should be null!
       AVC(LI+1) := Interfaces.C.Strings.Null_Ptr;
+      -- Check that the executable actually exists.
+      declare
+         use GNAT.OS_Lib;
+         EP : String_Access;
+      begin
+         EP := Locate_Exec_On_Path(File);
+         if EP = null then
+            -- It's not there.
+            Misc.Error("‘" & File & "’ is either not present or not executable.");
+         end if;
+         -- Free it.
+         Free(EP);
+      end;
       -- Actually do the exec.
       RV := Integer(C_Execvp(Interfaces.C.To_C(File), AVC));
       if RV = -1 then
@@ -374,7 +358,7 @@
                               "Exception raised in Externals.ForkExec_Append");
          raise;
    end ForkExec_Append;
-
+   
    function C_Open_Out_Wrapper (S : Interfaces.C.Char_Array)
                                 return Interfaces.C.int;
    pragma Import(C, C_Open_Out_Wrapper, "open_out_wrapper");
@@ -427,6 +411,37 @@
                                 return Interfaces.C.int;
    pragma Import(C, C_Open_In_Wrapper, "open_in_wrapper");
 
+   function ForkExec_In (File   : in String;
+			 Argv   : in UBS_Array;
+			 Source : in String) return Integer is
+      S, P, E : Integer;
+   begin
+      P := Fork;
+      if P = 0 then
+         -- Child.
+         -- Get new file handle.
+         S := Integer(C_Open_In_Wrapper(Interfaces.C.To_C(Source)));
+         if S = -1 then
+            Misc.Debug("Errno is "
+                    & Misc.Trim_Leading_Spaces(Integer'Image(Integer(C_Errno))));
+            C_Perror(Interfaces.C.To_C("Topal: problem in ForkExec_In"));
+            raise Open_In_Failed;
+         end if;
+         Dup2(S, 0);
+         Execvp(File, Argv);
+         return -1;
+      else
+         -- Parent.  Wait for the child to finish.
+         E := Waitpid(P);
+         return E;
+      end if;
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.ForkExec_In");
+         raise;
+   end ForkExec_In;
+   
    function ForkExec_InOut (File   : in String;
                             Argv   : in UBS_Array;
                             Source : in String;
@@ -759,5 +774,37 @@
                               "Exception raised in Externals.ForkExec3_Out");
          raise;
    end ForkExec3_Out;
+   
+   -- More wrappers.
+   function Open_Append (S : String) return Integer is
+   begin
+      return Integer(C_Open_Append_Wrapper(Interfaces.C.To_C(S)));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Open_Append");
+         raise;
+   end Open_Append;
+   
+   function Open_Out    (S : String) return Integer is
+   begin
+      return Integer(C_Open_Out_Wrapper(Interfaces.C.To_C(S)));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Open_Out");
+         raise;
+   end Open_Out;
+
+   function Open_In     (S : String) return Integer is
+   begin
+      return Integer(C_Open_In_Wrapper(Interfaces.C.To_C(S)));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Externals.Open_In");
+         raise;
+   end Open_In;
+   
 
 end Externals;

topal-package-72.tgz/externals.ads -> topal-package-76.tgz/externals.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -21,11 +21,6 @@
    function C_Get_Process_ID return Integer;
    pragma Import (C, C_Get_Process_ID, "getpid");
 
-   -- Get the environment.
-   No_Such_Environment_Variable : exception;
-
-   function Get_Env (Name : String) return String;
-
    -- Glob on a filename pattern.
    function Glob (Pattern : in String) return UBS_Array;
 
@@ -67,7 +62,12 @@
 
    -- Binding for waitpid.  We return the subprocess exit code.
    function Waitpid (PID : Integer) return Integer;
-
+   
+   -- Wrappers to open a file and get a file descriptor (e.g., for dup2).
+   function Open_Append (S : String) return Integer;
+   function Open_Out    (S : String) return Integer;
+   function Open_In     (S : String) return Integer;
+   
    -- ForkExec: a replacement for System.
    function ForkExec (File : in String;
                       Argv : in UBS_Array) return Integer;
@@ -79,7 +79,12 @@
    function ForkExec_Append (File   : in String;
                              Argv   : in UBS_Array;
                              Target : in String) return Integer;
-
+   
+   -- ForkExec: System with stdin.
+   function ForkExec_In (File   : in String;
+			 Argv   : in UBS_Array;
+			 Source : in String) return Integer;
+   
    -- ForkExec: a replacement for System + output stdout to target.
    function ForkExec_Out (File   : in String;
                           Argv   : in UBS_Array;

topal-package-72.tgz/globals.ads -> topal-package-76.tgz/globals.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -14,11 +14,9 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 with Ada.Characters.Latin_1;
+with Ada.Containers.Vectors;
 with Ada.Strings.Unbounded;
 with Ada.Text_IO;
-with Expanding_Array;
-
-pragma Elaborate_All(Expanding_Array);
 
 package Globals is
 
@@ -45,9 +43,20 @@
    type UBS_Array_Pointer is access UBS_Array;
 
    -- We also want expanding arrays....
-   package UBS_Array_Package is new Expanding_Array (Item => UBS);
-   package UAP renames UBS_Array_Package;
-   subtype UBS_Big_Array is UAP.Big_Array;
+   package UVP
+   is new Ada.Containers.Vectors (Index_Type => Positive,
+                                  Element_Type => UBS,
+                                  "=" => Ada.Strings.Unbounded."=");
+   subtype UVV is UVP.Vector;
+
+   -- We also want key-value pairs of UBS.
+   type UP is record
+      Key, Value : UBS;
+   end record;
+   package UPP
+   is new Ada.Containers.Vectors (Index_Type => Positive,
+				  Element_Type => UP);
+   subtype UPV is UPP.Vector;
 
    -- Want to insert line feeds in some strings.
    NL : constant String    := Ada.Characters.Latin_1.LF & "";
@@ -67,7 +76,7 @@
    Topal_Directory : UBS;
 
    type Binaries is
-     (Chmod, Clear, Date, Diff, File,
+     (Chmod, Clear, Cut, Date, Diff, File,
       Formail, GPGOP, GPGSM, Grep, Iconv, Less, Locale,
       Md5sum, Metamail, Mimeconstruct, Mimetool,
       Mkdir, Mkfifo, Mv, Openssl, Rm, Runmailcap,
@@ -75,11 +84,12 @@
 
    type Binaries_UBS is array (Binaries) of UBS;
 
-   type UBS_Opts_Keys is (My_Key, General_Options, Gpg_Options,
+   type UBS_Opts_Keys is (My_Key, General_Options, 
+			  GPG_Options, GPGSM_Options,
                           Receiving_Options, Sending_Options,
                           Colour_Menu_Title, Colour_Menu_Key,
                           Colour_Menu_Choice, Colour_Important,
-                          Colour_Banner, Colour_Info);
+                          Colour_Banner, Colour_Info, Decrypt_Prereq);
 
    type Boolean_Opts_Keys is (Decrypt_Cached_Fast_Continue,
                               Verify_Cached_Fast_Continue,
@@ -90,6 +100,10 @@
                               Omit_Inline_Disposition_Header,
                               Save_On_Send, -- If true, write to .topal/lastmail
                               ANSI_Terminal,
+                              Wait_If_Missing_Keys,
+			      Attachment_Trap,
+			      Fix_Fcc,
+			      Fix_Bcc,
                               Debug,
                               -- The following are not in the config file.
                               No_Clean, -- Not preserved in config file.
@@ -110,7 +124,9 @@
                                Verify_Cached_Use_Cache,
                                Mime_Viewer_Decrypt,
                                Mime_Viewer_Verify,
-                               Use_Agent);
+                               Use_Agent,
+			       Replace_IDs,
+			       Include_Send_Token);
    type UBS_Opts_Array is array (UBS_Opts_Keys) of UBS;
 
    type Boolean_Opts_Array is array (Boolean_Opts_Keys) of Boolean;
@@ -141,25 +157,34 @@
 
          -- Use_Agent: asks about using gpg-agent.
          -- 1 never, 2 only for decrypting (not signing!), 3 always
+	 
+	 -- Replace_IDs: only effective in sendmail-path mode.
+	 -- 0 do nothing, 1 replace only Message-ID, 2 replace both Message-ID and Content-ID.
+	 -- 1 & 2 use this pattern replacement:
+	 --   <alpine.DEB.2.00.1103061044360.3250@catbert.scm.tees.ac.uk>
+	 -- to
+	 --   <1103061044360.3250%pjb@scm.tees.ac.uk>
+	 -- where the address used is Alt_Sign (from the From line).
+	 
+	 -- Include_Send_Token: only effective in sendmail-path mode.
+	 -- 1 never, 2 ask, 3 always. Defaults to 3, but you may find 2 more useful.
 
          -- A list of keys to be associated with email addresses.
-         AKE_Key : UBS_Big_Array;
-         AKE_Email : UBS_Big_Array;
-         AKE_Count : Natural;
+	 -- Key: the crypto key; Value: the email.
+	 AKE : UPV;
          -- A list of keys to be excluded from the key list.
-         XK_Key : UBS_Big_Array;
-         XK_Count : Natural;
+         XK : UVV;
          -- And the same again, this time for the secret key lists.
-         SAKE_Key : UBS_Big_Array;
-         SAKE_Email : UBS_Big_Array;
-         SAKE_Count : Natural;
+         SAKE : UPV;
          -- A list of keys to be excluded from the key list.
-         SXK_Key : UBS_Big_Array;
-         SXK_Count : Natural;
+         SXK : UVV;
          -- A list of keys and the default send mode.
-         SD_KE : UBS_Big_Array;
-         SD_Mode : UBS_Big_Array;
-         SD_Count : Natural;
+         SD : UPV;
+	 -- A list of email addresses (Key) and the sendmail command to use (value).
+	 SC : UPV;
+	 -- Sending tokens.  A list of email addresses (from) and the
+	 --  token to use.  @ANY@ isn't valid.
+	 ST : UPV;
       end record;
 
    Config : Config_Record;

topal-package-72.tgz/help.txt -> topal-package-76.tgz/help.txt Changed

topal-package-72.tgz/invocation.adb -> topal-package-76.tgz/invocation.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -97,6 +97,8 @@
                Externals.Simple.Sed_InOut("s/^.*: //; s/\;.*//", PDCT, PDCT2);
                Content_Type := Read_Fold(PDCT2);
             end;
+	 elsif Match("-raw") then
+	    Run_Mode := Raw_Input;
          elsif Match("-mime") then
             if not More(Needed => 2) then
                Error("-mime needs two arguments: INFILE CONTENT-TYPE");
@@ -134,6 +136,9 @@
                Mimefile := Eat;
                Recipients := Eat_Remaining_Arguments;
             end if;
+         elsif Match("-asend") then
+	    Run_Mode := Actual_Send;
+	    Remaining := Eat_Remaining_Arguments;
          elsif Match("-remotesend") then
             if not More(Needed => 3) then
                Error("-remotesend needs at least three arguments: _TMPFILE_ _RESULTFILE_ _RVFILE_"
@@ -195,6 +200,10 @@
            or Command_Basename = "topal-fix-folder" then
             Run_Mode := Fix_Folders;
             Folders := Eat_Remaining_Arguments;
+         elsif Match(UBS_Array'(1 => ToUBS("--check-send-token"),
+                                2 => ToUBS("-cst"))) then
+            Run_Mode := Check_Send_Token;
+            CST_Token := Eat;
          elsif Match(UBS_Array'(1 => ToUBS("-nps"),
                                 2 => ToUBS("-s"))) then
             if not More then

topal-package-72.tgz/invocation.ads -> topal-package-76.tgz/invocation.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -20,13 +20,15 @@
    type Run_Modes is (Help_Text,
                       Inline_Display, Mime_Display, Old_Mime_Display,
                       Pipe_Display,
-                      Inline_Send, Mime_Send, Nonpine_Send,
+                      Inline_Send, Mime_Send, Actual_Send, Nonpine_Send,
                       Clear_Temp, Clear_Cache, Clear_All,
                       Dump_Default_Config, Dump_Current_Config,
                       Interactive_Config,
                       Fix_Email, Fix_Folders,
+		      Check_Send_Token,
                       Server, Remote_Send, Remote_Mime_Send,
-                      Remote_Decrypt, Remote_Mime_Decrypt
+                      Remote_Decrypt, Remote_Mime_Decrypt,
+		      Raw_Input
                       );
 
    Run_Mode : Run_Modes := Help_Text;
@@ -39,6 +41,8 @@
    Mimefile      : UBS;
    Recipients    : UBS_Array_Pointer;
    Folders       : UBS_Array_Pointer;
+   CST_Token     : UBS;
+   Remaining     : UBS_Array_Pointer;
 
    procedure Parse_Command_Line;

topal-package-72.tgz/keys.adb -> topal-package-76.tgz/keys.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -13,33 +13,44 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+with Ada.Containers.Vectors;
 with Ada.IO_Exceptions;
 with Ada.Strings.Fixed;
 with Ada.Strings.Maps;
 with Ada.Strings.Maps.Constants;
 with Ada.Strings.Unbounded;
 with Ada.Text_IO;
-with Expanding_Array;
 with Externals;             use Externals;
 with Externals.GPG;
+with Externals.Mail;
+with Externals.Simple;
 with Menus;                 use Menus;
 with Misc;                  use Misc;
 with Readline;
 
 package body Keys is
 
-   Key_List_Initial_Size : constant Positive := 200;
    Key_Head_Length       : constant Positive := 72;
 
    subtype Key_Head is String(1..Key_Head_Length);
-   package Key_Head_Array_Package
-   is new Expanding_Array (Item => Key_Head);
-   package KHA renames Key_Head_Array_Package;
-
-   subtype Key_Head_Array is Key_Head_Array_Package.Big_Array;
+   package KHP
+   is new Ada.Containers.Vectors (Index_Type => Positive,
+				  Element_Type => Key_Head);
+   subtype KHV is KHP.Vector;
 
    type Menu_Array_Ptr is access all Keylist_Menus.MNA;
-
+   
+   function Last8 (S : UBS) return UBS is
+      S2 : constant String := ToStr(S);
+   begin
+      if S2'Length <= 8 then
+	 return S;
+      else
+	 return ToUBS(S2(S2'Last-7..S2'Last));
+      end if;
+   end Last8;
+	
+   
    function Match_PR (KP : Key_Properties;
                       KR : Key_Roles) return Boolean is
    begin
@@ -67,7 +78,8 @@
       P := NullUBS;
       KP := Key_Properties'(others => False);
       if LS'Length >= 1
-        and then ToStr(LS(LS'First)) = "pub" then
+        and then (ToStr(LS(LS'First)) = "pub"
+		    or ToStr(LS(LS'First)) = "crt") then
          if LS'Length >= 2 then
             declare
                S : constant String := ToStr(LS(LS'First+1));
@@ -149,20 +161,31 @@
    end Process_Key;
 
    -- Given a fingerprint, return the process key info.
-   procedure Process_Key_By_FP (FP  : in     String;
-                                P   :    out UBS;
-                                KP  :    out Key_Properties) is
-      Key_Filename : constant String := Temp_File_Name("pkfp");
+   procedure Process_Key_By_FP (FP    : in     String;
+                                P     :    out UBS;
+                                KP    :    out Key_Properties;
+			        SMIME : in     Boolean) is
+      Key_Filename  : constant String := Temp_File_Name("pkfp");
+      Key_Filename2 : constant String := Temp_File_Name("pkfps");
       File_Handle  : Ada.Text_IO.File_Type;
       First_Line   : UBS;
    begin
-      Externals.GPG.Listkey(Key => FP, Target => Key_Filename);
+      Externals.GPG.Listkey(Key => FP, Target => Key_Filename, SMIME => SMIME);
       Ada.Text_IO.Open(File => File_Handle,
                        Mode => Ada.Text_IO.In_File,
                        Name => Key_Filename);
       First_Line := Unbounded_Get_Line(File_Handle);
       Ada.Text_IO.Close(File_Handle);
       Process_Key(ToStr(First_Line), P, KP);
+      if SMIME then
+	 -- Reuse Key_Filename and get a different view.
+	 Externals.GPG.Brief_View_SMIME_Key(Key => FP, Target => Key_Filename2);
+	 declare
+	    use type UBS;
+	 begin
+	    P := Last8(ToUBS(FP)) & ' ' & Read_Fold(Key_Filename2);
+	 end;
+      end if;
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
@@ -171,9 +194,9 @@
    end Process_Key_By_FP;
 
    -- Add a key to the list....
-   procedure Add_Key (Key  : in     UBS;
-                      List : in out Key_List;
-                      Role : in     Key_Roles) is
+   procedure Add_Key (Key   : in     UBS;
+                      List  : in out Key_List;
+                      Role  : in     Key_Roles) is
       Match        : Boolean := False;
       Key_Filename : constant String := Temp_File_Name("addkey");
       P            : UBS;
@@ -198,7 +221,9 @@
          end loop;
       end;
       -- Is this key usable?
-      Externals.GPG.Listkey(Key => ToStr(Key), Target => Key_Filename);
+      Externals.GPG.Listkey(Key    => ToStr(Key), 
+			    Target => Key_Filename, 
+			    SMIME  => List.SMIME);
       Ada.Text_IO.Open(File => File_Handle,
                        Mode => Ada.Text_IO.In_File,
                        Name => Key_Filename);
@@ -218,16 +243,15 @@
             use type UBS;
          begin
             Debug("Add_Key: Approaching duplicates loop");
-            for I in 1..List.Count loop
+            for I in 1..Integer(List.KA.Length) loop
                Debug("Add_Key: In duplicates loop");
-               Match := Match or Key = UAP.Value(List.KA, I);
+               Match := Match or Key = List.KA.Element(I);
             end loop;
          end;
          if not Match then
             -- Add the key.
             Debug("Add_Key: Adding a key");
-            List.Count := List.Count + 1;
-            UAP.Set(List.KA, List.Count, Key);
+            List.KA.Append(Key);
             Debug("Add_Key: Done adding a key");
          end if;
       end if;
@@ -238,8 +262,8 @@
          raise;
    end Add_Key;
 
-   -- Remove a key.  We then shuffle the array down.
-   -- It will only remove the last key if there are multiple instances.
+   -- Remove a key.  
+   -- Only deletes one instance.
    -- The nastiness here is that we might be working with short
    --  fingerprints.  So choose the right hand end of the fingerprint.
    procedure Remove_Key (Key                  : in     UBS;
@@ -250,10 +274,10 @@
       KS         : constant String  := ToStr(Key);
       Key_Length : constant Natural := KS'Length;
    begin
-      for I in 1..List.Count loop
+      for I in 1..Integer(List.KA.Length) loop
          declare
             -- Get this string...
-            TK       : constant String := ToStr(UAP.Value(List.KA, I));
+            TK       : constant String := ToStr(List.KA.Element(I));
             TK_Start : Integer;
          begin
             -- Is TK longer?
@@ -270,11 +294,7 @@
       end loop;
       if Key_Found then
          -- Shuffle the array over it.
-         for I in Key_Num .. List.Count - 1 loop
-            UAP.Set(List.KA, I, UAP.Value(List.KA, I+1));
-         end loop;
-         -- Reduce the number of keys.
-         List.Count := List.Count - 1;
+	 List.KA.Delete(Key_Num);
       else
          if Exception_If_Missing then
             raise Key_Not_Found;
@@ -292,8 +312,8 @@
       Result : UBS := Ada.Strings.Unbounded.Null_Unbounded_String;
       use type UBS;
    begin
-      for I in 1..List.Count loop
-         Result := Result & ToUBS(" -r ") & UAP.Value(List.KA, I) & ToUBS(" ");
+      for I in 1..Integer(List.KA.Length) loop
+         Result := Result & ToUBS(" -r ") & List.KA.Element(I) & ToUBS(" ");
       end loop;
       return ToStr(Result);
    exception
@@ -303,6 +323,36 @@

topal-package-72.tgz/keys.ads -> topal-package-76.tgz/keys.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -43,9 +43,10 @@
                           KP :    out Key_Properties);
 
    -- Given a fingerprint, return the process key info.
-   procedure Process_Key_By_FP (FP  : in     String;
-                                P   :    out UBS;
-                                KP  :    out Key_Properties);
+   procedure Process_Key_By_FP (FP    : in     String;
+                                P     :    out UBS;
+                                KP    :    out Key_Properties;
+			        SMIME : in     Boolean);
 
    -- Add a key to the list....
    procedure Add_Key (Key  : in     UBS;
@@ -53,8 +54,8 @@
                       Role : in     Key_Roles);
    Fingerprint_Expected : exception;
 
-   -- Remove a key.  We then shuffle the array down.
-   -- It will only remove the last key if there are multiple instances.
+   -- Remove a key.
+   -- Only deletes one instance.
    procedure Remove_Key (Key                  : in     UBS;
                          List                 : in out Key_List;
                          Exception_If_Missing : in     Boolean := False);
@@ -62,6 +63,10 @@
    -- Turn the list of keys to send into `-r <key>' string.
    function Processed_Recipient_List (List : in Key_List) return String;
 
+   -- Turn the list of keys to send into a list of filenames and
+   --  create those files.
+   function Processed_Recipient_List_OpenSSL (List : in Key_List) return String;
+
    -- Get key fingerprint(s) for a key.  Add them.
    -- The name is a bit odd.  Really, they should be `Search_For_Keys' or similar.
    -- The `By_Fingerprint' bit refers to how the keys are recorded.
@@ -98,7 +103,8 @@
                           List       : in out Key_List;
                           Missing    :    out Boolean);
 
-   procedure Empty_Keylist (List : in out Key_List);
+   procedure Empty_Keylist (List  : in out Key_List;
+			    SMIME : in     Boolean);
 
    function Count (List : in Key_List) return Natural;
 
@@ -109,8 +115,8 @@
 
    type Key_List is
       record
-         KA    : UBS_Big_Array;
-         Count : Natural;
+         KA    : UVV;
+	 SMIME : Boolean;  -- A flag that changes further internal operations.
       end record;
 
 end Keys;

topal-package-72.tgz/menus.ads -> topal-package-76.tgz/menus.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -75,7 +75,7 @@
                        Toggle_ISO, MV_D_Setting, MV_V_Setting,
                        UGA_Setting,
                        Toggle_OIDN, Toggle_OIDH,
-                       Toggle_SOS);
+                       Toggle_SOS, Toggle_WIMS);
 
    package Edit_Menus is new Char_Menus (Index => Edit_Index);
 
@@ -99,6 +99,7 @@
                        Toggle_OIDN  => ToUBS("iI"),
                        Toggle_OIDH  => ToUBS("hH"),
                        Toggle_SOS   => ToUBS("nN"),
+                       Toggle_WIMS   => ToUBS("tT"),
                        Reset        => ToUBS("rR")),
       Char_Words =>
         Edit_Menus.MA'(Quit         => ToUBS("[Quit editing]"),
@@ -118,26 +119,26 @@
                        Toggle_OIDN  => ToUBS("[Toggle omit-inline-disposition-name]"),
                        Toggle_OIDH  => ToUBS("[Toggle omit-inline-disposition-header]"),
                        Toggle_SOS   => ToUBS("[Toggle save-on-send]"),
+                       Toggle_WIMS  => ToUBS("[Toggle wait-if-missing-keys"),
                        Reset        => ToUBS("[Reset to current saved configuration]")),
       Default_Prompt => "Change: "
       & " {m} Own key"
-      & "                                  {o} GPG options" & NL
+      & "                         {o} GPG options" & NL
       & "         {e} Decrypt/verify settings"
       & "         {c} Toggle inline-separate-output" & NL
       & "         {h} Toggle omit-inline-disposition-header" & NL
       & "         {i} Toggle omit-inline-disposition-name" & NL
-      & "         {n} Toggle save-on-send" & NL
-      & "         {v} Change MIME viewer (decrypt) setting" & NL
-      & "         {w} Change MIME viewer (verify) setting" & NL
+      & "         {n} Toggle save-on-send             {t} Toggle wait-if-missing-keys" & NL
+      & "         MIME viewer: {v} Change (decrypt) setting  {w} Change (verify) setting" & NL
       & "         {g} Change use GPG agent" & NL
-      & "         {a} Key associations (interactive config not implemented)" & NL
-      & "         {x} Key exclusions (interactive config not implemented)" & NL
+--      & "         {a} Key associations (interactive config not implemented)" & NL
+--      & "         {x} Key exclusions (interactive config not implemented)" & NL
       & "         {p} Binary paths (interactive config not implemented)" & NL
       & "         {r} Set config to current saved file"
-      & "         {d} Set all defaults" & NL
+      & "       {d} Set all defaults" & NL
       & "         {b} Toggle debugging" & NL
       & "         {s} Save changes"
-      & "                             {q} Quit editing" & NL);
+      & "                           {q} Quit editing" & NL);
 
    -- Configuration options submenu.
 
@@ -304,9 +305,10 @@
                            Remote, Go,
                            -- Stuff that used to be in the MIME menu.
                            InlinePlain, AppPGP,
-                           Multipart, MultipartEncap);
+                           Multipart, MultipartEncap,
+			   SMIME);
    subtype Send_Modes is SendMime_Index range Encrypt .. DetachSignPO;
-   subtype MIME_Modes is SendMime_Index Range InlinePlain .. MultipartEncap;
+   subtype MIME_Modes is SendMime_Index Range InlinePlain .. SMIME;
 
    package Send_Menus is new Char_Menus (Index => SendMime_Index);
 
@@ -331,6 +333,7 @@
                        AppPGP          => ToUBS("2"),
                        Multipart       => ToUBS("3"),
                        MultipartEncap  => ToUBS("4"),
+		       SMIME           => ToUBS("pP"),
                        EncryptPO | SignEncryptPO | ClearSignPO | DetachSignPO => ToUBS("")),
       Char_Words   =>
         Send_Menus.MA'(AAbort          => ToUBS("[Abort]"),
@@ -344,13 +347,14 @@
                        SignEncrypt     => ToUBS("[Sign-encrypt]"),
                        ClearSign       => ToUBS("[Clearsign]"),
                        Configure       => ToUBS("[Configuration]"),
-                       NoGPG           => ToUBS("[Unchanged; no GPG]"),
+                       NoGPG           => ToUBS("[Unchanged; no crypto]"),
                        Remote          => ToUBS("[Remote now]"),
                        Go              => ToUBS("[Go now]"),
                        InlinePlain     => ToUBS("[Inline plain text]"),
                        AppPGP          => ToUBS("[application/pgp]"),
                        Multipart       => ToUBS("[RFC2015 multipart]"),
                        MultipartEncap  => ToUBS("[Multipart encapsulated]"),
+		       SMIME           => ToUBS("[SMIME]"),
                        EncryptPO | SignEncryptPO | ClearSignPO | DetachSignPO => ToUBS("")),
       Default_Prompt =>
 "{lkr} List/edit recip. keys   {@} Add own key       {w} Edit own key" & NL &
@@ -358,7 +362,8 @@
 "{e} Encrypt                   {2} app/pgp           {m} Edit mail" & NL &
 "{s} Sign-encrypt              {3} multipart/*       {a} List/edit attachments" & NL &
 "{c} Clearsign                 {4} multipart encap   {o} Configuration" & NL &
-"{g} Go!                       {r} Remote!           {q} Abort!" & NL
+"{g} Go!                       {r} Remote!           {q} Abort!" & NL &
+"                              {p} S/MIME  " & NL
      );
 
    function Send_Menu_Pine_Plain
@@ -379,6 +384,7 @@
                        Remote          => ToUBS("rR"),
                        Go              => ToUBS("gG"),
                        InlinePlain | AppPGP | Multipart | MultipartEncap
+		       | SMIME
                        | EncryptPO | SignEncryptPO | ClearSignPO | DetachSignPO => ToUBS("")),
       Char_Words   =>
         Send_Menus.MA'(AAbort          => ToUBS("[Abort]"),
@@ -396,6 +402,7 @@
                        Remote          => ToUBS("[Remote now]"),
                        Go              => ToUBS("[Go now]"),
                        InlinePlain | AppPGP | Multipart | MultipartEncap
+		       | SMIME
                        | EncryptPO | SignEncryptPO | ClearSignPO | DetachSignPO => ToUBS("")),
       Default_Prompt =>
 "{lkr} List/edit recip. keys   {@} Add own key       {w} Edit own key" & NL &
@@ -426,7 +433,7 @@
                        NoGPG             => ToUBS("nN"),
                        Configure         => ToUBS("oO"),
                        Go                => ToUBS("gG"),
-                       Remote | InlinePlain | AppPGP | Multipart | MultipartEncap    => ToUBS("")),
+                       Remote | InlinePlain | AppPGP | Multipart | MultipartEncap | SMIME   => ToUBS("")),
       Char_Words   =>
         Send_Menus.MA'(AAbort            => ToUBS("[Abort]"),
                        ListEdit          => ToUBS("[List/edit current recipient keys]"),
@@ -445,7 +452,7 @@
                        NoGPG             => ToUBS("[Unchanged; no GPG]"),
                        Configure         => ToUBS("[Configuration]"),
                        Go                => ToUBS("[Go now]"),
-                       Remote | InlinePlain | AppPGP | Multipart | MultipartEncap    => ToUBS("")),
+                       Remote | InlinePlain | AppPGP | Multipart | MultipartEncap | SMIME   => ToUBS("")),
       Default_Prompt =>
 "{lkr} List/edit recip. keys   {@} Add own key       {w} Edit own key" & NL &
 "{n} Pass through unchanged    {D} Detach sig prsv   {v} View mail " & NL &

topal-package-72.tgz/misc.adb -> topal-package-76.tgz/misc.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -13,6 +13,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+with Ada.Characters.Handling;
 with Ada.Characters.Latin_1;
 with Ada.Command_Line;
 with Ada.Integer_Text_IO;
@@ -21,6 +22,7 @@
 with Ada.IO_Exceptions;
 with Ada.Strings;
 with Ada.Strings.Fixed;
+with Ada.Strings.Maps.Constants;
 with Externals.Simple;
 with Help;
 with Version_ID;
@@ -65,7 +67,7 @@
                            Do_SGR(Config.UBS_Opts(Colour_Important))
                              & "Topal: Fatal error: " & The_Error
                              & Reset_SGR);
-      raise Panic;
+      raise Panic with The_Error;
    end Error;
 
    procedure ErrorNE (The_Error : in String) is
@@ -119,18 +121,74 @@
                               "Exception raised in Misc.String_To_Integer (B)");
          raise;
    end String_To_Integer;
-
+   
+   -- Zero pad to a length.
+   function Zero_Pad (S : String; L : Positive) return String is
+   begin
+      if S'Length >= L then
+	 return S;
+      else
+	 return Ada.Strings.Fixed."*"(L - S'Length, '0') & S;
+      end if;
+   end Zero_Pad;
+   
    -- Throw away leading blanks from a string.
    function Trim_Leading_Spaces (S : String) return String is
       use Ada.Strings.Fixed;
    begin
-      return S(Ada.Strings.Fixed.Index_Non_Blank(S)..S'Last);
+      if S'Length = 0 then
+	 return S;
+      else
+	 return S(Ada.Strings.Fixed.Index_Non_Blank(S)..S'Last);
+      end if;
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
                               "Exception raised in Misc.Trim_Leading_Spaces");
          raise;
    end Trim_Leading_Spaces;
+   
+   function EqualCI (A, B : String) return Boolean is
+      use Ada.Strings.Fixed, Ada.Strings.Maps.Constants;
+   begin
+      return Translate(A, Lower_Case_Map) = Translate(B, Lower_Case_Map);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Misc.EqualCI (A)");
+         raise;
+   end EqualCI;
+      
+   function EqualCI (A, B : UBS) return Boolean is
+   begin
+      return EqualCI(ToStr(A), ToStr(B));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Misc.EqualCI (B)");
+         raise;
+   end EqualCI;
+      
+   function EqualCI (A : String; B : UBS) return Boolean is
+   begin
+      return EqualCI(A, ToStr(B));
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Misc.EqualCI (C)");
+         raise;
+   end EqualCI;
+      
+   function EqualCI (A : UBS; B : String) return Boolean is
+   begin
+      return EqualCI(ToStr(A), B);
+   exception
+      when others =>
+         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+                              "Exception raised in Misc.EqualCI (D)");
+         raise;
+   end EqualCI;
+      
 
    -- Create our own temporary file names.  To prevent collisions when
    --  the same Tail is used, we'll also insert a sequence number.
@@ -148,7 +206,7 @@
            & "/temp-"
            & Trim_Leading_Spaces(Integer'Image(Our_PID))
            & "-"
-           & Trim_Leading_Spaces(Integer'Image(Temp_File_Sequence_Number))
+           & Zero_Pad(Trim_Leading_Spaces(Integer'Image(Temp_File_Sequence_Number)), 3)
            & "-"
            & Tail;
       else
@@ -210,9 +268,11 @@
    end Unbounded_Get_Line;
 
    -- Eat and fold an entire file.
-   function Read_Fold (File : in String) return UBS is
-      F : Ada.Text_IO.File_Type;
-      U : UBS := NullUBS;
+   function Read_Fold (File       : in String;
+		       Include_LF : in Boolean := False) return UBS is
+      F     : Ada.Text_IO.File_Type;
+      U     : UBS                   := NullUBS;
+      Do_LF : Boolean               := False;
    begin
       Debug("Opening file `" & File & "' for folded read into variable");
       Ada.Text_IO.Open(File => F,
@@ -224,6 +284,14 @@
             use type UBS;
          begin
             U := U & Unbounded_Get_Line(F);
+	    -- End_Error might kick us out before appending the LF.
+	    if Do_LF then
+	       U := U & Ada.Characters.Latin_1.LF;
+	       Do_LF := False;
+	    end if;
+	    if Include_LF then
+	       Do_LF := True;
+	    end if;
          exception
             when Ada.IO_Exceptions.End_Error => exit Read_Loop; -- Okay.
          end;
@@ -269,7 +337,7 @@
       Put_Line(Do_SGR(Config.UBS_Opts(Colour_Banner))
                  & "Topal " & Version_ID.Release
                  & " (" & Version_ID.Build_Date & ")");
-      Put_Line("Copyright (C) 2001--2010 Phillip J. Brooke"
+      Put_Line("Copyright (C) 2001--2015 Phillip J. Brooke"
                  & Reset_SGR);
       Help.Disclaimer;
       New_Line;
@@ -309,10 +377,8 @@
    -- Then added `stuffing'.  `"' will group things as an argument (i.e., stop the
    -- search).  `"' can be included literally by stuffing: `""'.
    function Split_Arguments (A : UBS) return UBS_Array is
-      BA : UBS_Big_Array;
+      BA : UVV;
       AS : constant String := ToStr(A);
-      TI : Integer := 0;
-      use UAP;
 
       -- Recurse:
       -- Given a string, extract one token from it.
@@ -378,8 +444,7 @@
                             & "' ended inside `""'.");
                        end if;
                        -- Finished.
-                       TI := TI + 1;
-                       Set(BA, TI, T);
+                       BA.Append(T);
                        -- Recurse.
                        Grab_Next_Token(A(I .. A'Last));
                 end if;
@@ -395,13 +460,13 @@
       Debug("Split_Arguments invoked with `"
         & AS
         & "'");
-      Create(BA, 100);
+      BA := UVP.Empty_Vector;
       Grab_Next_Token(AS);
       declare
-         RA : UBS_Array(0..TI-1);
+         RA : UBS_Array(0..Integer(BA.Length)-1);
       begin
-         for I in 1 .. TI loop
-            RA(I-1) := Value(BA, I);
+         for I in 1 .. Integer(BA.Length) loop
+            RA(I-1) := BA.Element(I);
          end loop;
          return RA;
       end;
@@ -447,6 +512,26 @@
            "Exception raised in Misc.Split_GPG_Colons");
          raise;

topal-package-72.tgz/misc.ads -> topal-package-76.tgz/misc.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -50,6 +50,12 @@
 
    -- Throw away leading blanks from a string.
    function Trim_Leading_Spaces (S : String) return String;
+   
+   -- Case insensitive comparison of two strings.
+   function EqualCI (A, B : UBS) return Boolean;
+   function EqualCI (A : String; B : UBS) return Boolean;
+   function EqualCI (A : UBS; B : String) return Boolean;
+   function EqualCI (A, B : String) return Boolean;
 
    -- Create our own temporary file names.  A sequence number is also
    --  inserted unless Use_Sequence_Number is set to False.
@@ -63,7 +69,9 @@
    function Unbounded_Get_Line return UBS;
 
    -- Eat and fold an entire file.
-   function Read_Fold (File : in String) return UBS;
+   -- Set Include_LF to true to add a LF each new line.
+   function Read_Fold (File       : in String;
+		       Include_LF : in Boolean := False) return UBS;
 
    -- Open and close the result file.
    procedure Open_Result_File (Resultfile : in String);
@@ -86,7 +94,11 @@
 
    -- Split up a GPG colon-separated line.
    function Split_GPG_Colons (AS : String) return UBS_Array;
-
+   
+   -- Construct a UP.
+   function UPC (A, B : String) return UP;
+   function UPC (A, B : UBS) return UP;
+   
    -- Get the basename of a filename.
    function Basename (S : String) return String;
 
@@ -95,6 +107,9 @@
 
    -- Hexadecimal decoder.
    function Hex_Decode (S : in String) return Natural;
+   
+   -- Have we got base64 or binary?
+   function Guess_SMIME_Encoding(Infile : String) return String;
 
    -- Return a string for --[no-]use-agent depending on config and the
    --  type of operation.

topal-package-72.tgz/mkdistrib -> topal-package-76.tgz/mkdistrib Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Topal: GPG/GnuPG and Alpine/Pine integration
-# Copyright (C) 2001--2010  Phillip J. Brooke
+# Copyright (C) 2001--2015  Phillip J. Brooke
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -18,6 +18,7 @@
 	cat > index.html <<EOF
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>
 Topal: GPG/GnuPG and Alpine/Pine integration: Distribution page
 </title>
@@ -48,7 +49,7 @@
 
 <h1>Topal: GPG/GnuPG and Alpine/Pine integration</h1>
 
-<p>Copyright (C) 2001--2010  Phillip J. Brooke</p>
+<p>Copyright (C) 2001--2015  Phillip J. Brooke</p>
 
 
 <p>Topal is a \`glue' program that links 
@@ -56,78 +57,49 @@
 and 
 <a href="http://www.washington.edu/pine/">Pine</a>/<a href="http://www.washington.edu/alpine/">Alpine</a>.  It offers
 facilities to encrypt, decrypt, sign and verify emails. 
-This is the feature list from the <a href="README.html">README</a> file:
 </p>
+
+<h2>Features</h2>
 EOF
-sed '//,// ! d' < README.html >>index.html
+sed '//,// ! d' < ../Features.html >>index.html
 
 	cat >> index.html <<EOF
 
 <p>
-See the <a href="README.html">README</a> 
-file for all the stuff like licensing, 
-<a href="README.html#todo">TO DO</a>, 
-<a href="README.html#last-changes">recent changes</a>, etc.
+See the included documentation 
+for all the stuff like licensing, recent changes and instructions.
 </p>
 
+<h2>Release $1</h2>
 <p>
 The current release of Topal is <b>$1</b>.  Send email to 
-<a href="mailto:pjb@lothlann.freeserve.co.uk"><tt>pjb@lothlann.freeserve.co.uk</tt></a>
+<a href="mailto:p.j.brooke@bcs.org.uk"><tt>p.j.brooke@bcs.org.uk</tt></a>
 if you would like to be notified of new Topal releases by email.
 </p>
 
-<hr/>
 
-<p>
-The most recent changes were:
-<dl>
-EOF
-sed '//,// ! d' < README.html >>index.html
-
-	cat >> index.html <<EOF
-</dl>
-
-<hr/>
-
-<p>Files available are:</p>
+<h3>Files for download</h3>
 <ul>
-<li> The <a href="README.html">README</a> file.</li>
-<li> <a href="COPYING">GNU Public Licence version 3</a>.
 <li> The <a href="topal-package-$1.tgz">source code package</a>
  (`ls -sk topal-package-$1.tgz|awk '{print $1}'` kB, release $1) and a 
      <a href="topal-package-$1.tgz.asc">detached signature</a>.
      <br/>
-     You will need the source package, even if you don't want to compile Topal yourself.  The documentation is included in the tarball.
-<li> The <a href="topal.gz">topal binary for Linux x86</a>
- (`ls -sk topal.gz|awk '{print $1}'` kB, not stripped, gzip'd, release $1) and a 
-     <a href="topal.gz.asc">detached signature</a>.
-
-     The output of ldd for the topal binary (on the build machine) is
-<pre>
-EOF
-
-ldd ../topal | sed 's/>/\&gt;/g' >> index.html
-
-
-	cat >> index.html <<EOF
-</pre>
-<li> The <a href="topal-ps.gz">topal binary for Linux x86</a>
- (statically linked against the GNAT library, `ls -sk topal-ps.gz|awk '{print $1}'` kB, stripped, gzip'd, release $1) and a 
-     <a href="topal-ps.gz.asc">detached signature</a>.  You'll need to rename this as \`topal'.
+     Full documentation is included in the tarball.</li>
+<li> <a href="topal.pdf">Documentation (PDF, `ls -sk topal.pdf|awk '{print $1}'` kB)</a>.</li>
+<li> <a href="COPYING">GNU Public Licence version 3</a>.</li>
+<li> Some features (sending of any content-type except text/plain) require 
+a patch to Pine.</li>
+</ul>
 
-     The output of ldd for this binary (on the build machine) is
-<pre>
+<h3>Most recent changes</h3>
+<dl>
 EOF
-
-ldd ../topal-ps | sed 's/>/\&gt;/g' >> index.html
-
+sed '//,// ! d' < ../Changelog.html >>index.html
 
 	cat >> index.html <<EOF
-</pre>
-<li> Some features (sending of any content-type except text/plain) require 
-a patch to Pine.  (See the <a href="README.html">README</a>.)
-</ul>
+</dl>
 
+<hr/>
 <p>
 EOF

topal-package-76.tgz/mkversionidtex Added

topal-package-72.tgz/receiving.adb -> topal-package-76.tgz/receiving.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2009  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -13,11 +13,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+with Ada.Containers.Vectors;
 with Ada.IO_Exceptions;
 with Ada.Strings.Fixed;
 with Ada.Strings.Maps.Constants;
 with Ada.Text_IO;
-with Expanding_Array;
 with Externals;                  use Externals;
 with Externals.GPG;
 with Externals.Mail;
@@ -30,16 +30,18 @@
 with Remote_Mode;
 
 package body Receiving is
-
+   
    -- A local subprogram common to both Display and Mime_Display to sort
    -- out whether to process the block, and whether to use cache and how.
    procedure Process_Check (Decrypt       : in     Boolean;
+			    SMIME         : in     Boolean;
                             Cached        : in     Boolean;
                             Process_Block :    out Boolean;
                             Use_Cache     :    out Boolean;
                             Write_Cache   :    out Boolean;
                             Remote_Block  :    out Boolean) is
       YNR : YNR_Index;
+      Decrypt_Possible : Boolean := True;
    begin
       Debug("+Receiving.Process_Check");
       Process_Block := False;
@@ -82,14 +84,34 @@
                end if;
             end if;
          else
-            if Config.Positive_Opts(Decrypt_Not_Cached) = 1 then
-               Ada.Text_IO.Put_Line("No cache file exists, decrypting");
-               Process_Block := True;
-            elsif Config.Positive_Opts(Decrypt_Not_Cached) = 2 then
-               YNR := YNR_Menu("No cache file exists; decrypt? (yes/no/remote) ");
-               Process_Block := YNR = Yes or YNR = Remote;
-               Remote_Block := YNR = Remote;
+            -- It's not cached.  Do we decrypt it?
+            -- First check if decrypt-prereq is set.
+            if ToStr(Config.UBS_Opts(Decrypt_Prereq)) /= "" then
+               -- Run the prereq, collect the return value.  If it
+               --  returns 0, good.  Anything, else, set the
+               --  Decrypt_Possible flag to false.
+               if Externals.Ops.Test_Decrypt_Prerequisite > 0 then
+                  Decrypt_Possible := False;
+               end if;
+            end if;
+	    -- FIXME: the next bit is a shortcircuit for SMIME.
+	    if SMIME then
+	       Decrypt_Possible := True;
+	    end if;
+            -- Perhaps ask the user what to do.
+            if Decrypt_Possible then
+               if Config.Positive_Opts(Decrypt_Not_Cached) = 1 then
+                  Ada.Text_IO.Put_Line("No cache file exists, decrypting");
+                  Process_Block := True;
+               elsif Config.Positive_Opts(Decrypt_Not_Cached) = 2 then
+                  YNR := YNR_Menu("No cache file exists; decrypt? (yes/no/remote) ");
+                  Process_Block := YNR = Yes or YNR = Remote;
+                  Remote_Block := YNR = Remote;
+               end if;
+            else
+               Ada.Text_IO.Put_Line("Decrypt prerequisite false, not decrypting.");
             end if;
+            -- If we're processing the block, sort out the cache usage.
             if Process_Block then
                if Config.Positive_Opts(Decrypt_Not_Cached_Use_Cache) = 1 then
                   Ada.Text_IO.Put_Line("Will write cache file");
@@ -157,17 +179,16 @@
          raise;
    end Process_Check;
 
-   Block_Array_Initial_Size : constant Positive := 100;
-
    type Block_Record is
       record
-         Used : Boolean := False;
          PGP  : Boolean := False;
          Decrypt : Boolean := False;
       end record;
 
-   package Block_Array_Package
-   is new Expanding_Array (Item => Block_Record);
+   package BAP
+   is new Ada.Containers.Vectors (Index_Type   => Positive,
+				  Element_Type => Block_Record);
+   subtype BAV is BAP.Vector;
 
    -- We want to verify or decrypt a message.
    procedure Display (Tmpfile : in String) is
@@ -183,9 +204,7 @@
       -- message starts -----BEGIN PGP SIGNED MESSAGE----- (i.e., we won't
       -- need a passphrase).
 
-      use Block_Array_Package;
-
-      Blocks : Big_Array;
+      Blocks : BAV;
 
       -- Flag indicating if we should wait at the end.
       Do_Wait : Boolean := False;
@@ -194,7 +213,7 @@
       -- Save the original input.
       Externals.Simple.Cat_Out(Tmpfile, Originfile);
       -- Initialize Blocks.
-      Create(Blocks, Block_Array_Initial_Size);
+      Blocks := BAP.Empty_Vector;
       -- Make sure that the cache directory exists.
       Mkdir_P(ToStr(Cache_Dir));
       -- Turn the received message in Tmpfile into blocks.
@@ -205,8 +224,6 @@
          TF : File_Type;
          -- The handle for the current block:
          BF : File_Type;
-         -- Block count is the index into the arrays.
-         Block_Count : Positive := 1;
          -- The state machine is fairly noddy.
          type State_Machine_Modes is (Starting, Verbatim, Message, Signed);
          State : State_Machine_Modes := Starting;
@@ -236,7 +253,7 @@
                   function Block_Name return String is
                   begin
                      return Temp_File_Name("block"
-                                           & Trim_Leading_Spaces(Integer'Image(Block_Count)),
+                                           & Trim_Leading_Spaces(Integer'Image(Integer(Blocks.Length)+1)),
                                            Use_Sequence_Number => False);
                   exception
                      when others =>
@@ -245,15 +262,11 @@
                         raise;
                   end Block_Name;
 
-                  procedure Set_BR (Used    : Boolean := False;
-                                    PGP     : Boolean := False;
+                  procedure Set_BR (PGP     : Boolean := False;
                                     Decrypt : Boolean := False) is
                   begin
-                     Set(Blocks,
-                         Block_Count,
-                         Block_Record'(Used    => Used,
-                                       PGP     => PGP,
-                                       Decrypt => Decrypt));
+                     Blocks.Append(Block_Record'(PGP     => PGP,
+						 Decrypt => Decrypt));
                   exception
                      when others =>
                         Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
@@ -282,8 +295,7 @@
                            -- Write this line.
                            Put_Line(BF, The_Line);
                            -- Set the arrays and state appropriately.
-                           Set_BR(Used    => True,
-                                  PGP     => True,
+                           Set_BR(PGP     => True,
                                   Decrypt => True);
                            State := Message;
                         elsif The_Line'Length >= Signed_Start'Length
@@ -304,8 +316,7 @@
                            -- Write this line.
                            Put_Line(BF, The_Line);
                            -- Set the arrays and state appropriately.
-                           Set_BR(Used => True,
-                                  PGP  => True);
+                           Set_BR(PGP  => True);
                            State := Signed;
                         else
                            -- This line is verbatim.
@@ -322,7 +333,7 @@
                            -- Write this line.
                            Put_Line(BF, The_Line);
                            -- Set the arrays and state appropriately.
-                           Set_BR(Used => True);
+                           Set_BR;
                            State := Verbatim;
                         end if;
                      when Verbatim =>
@@ -333,7 +344,6 @@
                            -- This line starts a PGP message.
                            -- Close the existing block.
                            Close(BF);
-                           Block_Count := Block_Count + 1;
                            -- Open a new block.
                            begin
                               Create(File => BF,
@@ -347,8 +357,7 @@
                            -- Write this line.

topal-package-72.tgz/receiving.ads -> topal-package-76.tgz/receiving.ads Changed

topal-package-76.tgz/screens Added

topal-package-76.tgz/screens/examineKeyMenu.png Added

topal-package-76.tgz/screens/keyListMenu.png Added

topal-package-76.tgz/screens/mainSendMenu.png Added

topal-package-76.tgz/screens/npsSendMenu.png Added

topal-package-76.tgz/sending-clearsign.adb Added

@@ -0,0 +1,254 @@
+-- Topal: GPG/GnuPG and Alpine/Pine integration
+-- Copyright (C) 2001--2015  Phillip J. Brooke
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License version 3 as
+-- published by the Free Software Foundation.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+separate(Sending)
+procedure Clearsign  (Tmpfile   : in String;
+		      Non_Pine  : in Boolean;
+		      Mime      : in Boolean;
+		      Mimefile  : in String;
+		      Selection : in Send_Modes;
+		      Mime_Selection : in MIME_Modes;
+		      AL        : in Attachments.Attachment_List;
+		      Hdrfile   : in String;
+		      Recipients : in UBS_Array;
+		      Actual_Send : in Boolean;
+		      New_Headers : out UVV;
+		      AS_Content_Type : in String) is
+   Out_File       : constant String   := Temp_File_Name("out");
+   SFD_File       : constant String   := Temp_File_Name("sfd");
+   QP_File        : constant String   := Temp_File_Name("qp");
+   TDS_File       : constant String   := Temp_File_Name("tds");
+   SMIME_Opaque   : YN_Index;
+begin
+   -- Run GPG.
+   if Mime and then (Mime_Selection = Multipart
+		       or Mime_Selection = SMIME) then
+      -- We need to do something different with Tmpfile.
+      -- First, we delete all trailing blank lines.
+
+      begin
+	 Prepare_For_Clearsign(Tmpfile,
+			       QP_File,
+			       AS_Content_Type);
+	 -- Call out to attachments in case we have to modify QP_File.
+	 Attachments.Replace_Tmpfile(QP_File, AL);
+	 -- Then we clearsign it.
+	 if Mime_Selection = SMIME then
+	    -- Offer to do this opaquely.  Note that there isn't an
+	    --  analogue of this for OpenPGP/MIME.
+	    Ada.Text_IO.New_Line(3);
+	    Ada.Text_IO.Put_Line("Some mail servers mangle clearsigned messages.  Instead, you could");
+	    Ada.Text_IO.Put_Line("send this message as an opaque signed message.  However, if you send");
+	    Ada.Text_IO.Put_Line("an opaque signed message, the recipient will need an S/MIME capable");
+	    Ada.Text_IO.Put_Line("mail user agent to read it.");
+	    Ada.Text_IO.New_Line;
+	    SMIME_Opaque := YN_Menu("Send this as an opaque message?  (Answer ‘n’ to send clearsigned.) ");
+	    if SMIME_Opaque = Yes then
+	       Externals.GPG.GPGSM_Wrap(" --base64 --sign --local-user "
+					  & Value_Nonempty(Config.UBS_Opts(my_key))
+					  & " "
+					  & " --output "
+					  & TDS_File
+					  & " "
+					  & QP_File,
+					TDS_File,
+					SFD_File);
+	    else
+	       Externals.GPG.GPGSM_Wrap(" --base64 --detach-sign --local-user "
+					  & Value_Nonempty(Config.UBS_Opts(my_key))
+					  & " "
+					  & " --output "
+					  & TDS_File
+					  & " "
+					  & QP_File,
+					TDS_File,
+					SFD_File);
+	    end if;
+	 else
+	    Externals.GPG.GPG_Wrap(" --detach-sign --textmode --armor --local-user "
+				     & Value_Nonempty(Config.UBS_Opts(my_key))
+				     & " "
+				     & UGA_Str(Signing => True)
+				     & " "
+				     & " --output "
+				     & TDS_File
+				     & " "
+				     & QP_File,
+				   TDS_File,
+				   SFD_File);
+	 end if;
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Clearsign (GPG MIME/3 block 1)");
+	    raise;
+      end;
+   else
+      begin
+	 Externals.GPG.GPG_Wrap(" --clearsign --textmode --local-user "
+				  & Value_Nonempty(Config.UBS_Opts(my_key))
+				  & " "
+				  & UGA_Str(Signing => True)
+				  & " --output "
+				  & Out_File
+				  & " "
+				  & Tmpfile,
+				Out_File,
+				SFD_File);
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Clearsign (GPG block)");
+	    raise;
+      end;
+   end if;
+
+   begin
+      if not (Mime and then (Mime_Selection = Multipart
+			       or Mime_Selection = SMIME)) then
+	 if Selection = ClearsignPO then
+	    -- Rename the file appropriately.
+	    Mv_F(Out_File, Tmpfile & ".asc");
+	 else
+	    Mv_F(Out_File, Tmpfile);
+	 end if;
+      end if;
+   exception
+      when others =>
+	 Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+			      "Exception raised in Sending.Clearsign (MV block)");
+	 raise;
+   end;
+
+   begin
+      if Mime then
+	 case Mime_Selection is
+	    when InlinePlain => -- Inline plain text
+	       Echo_Out("Content-Type: text/plain", Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: text/plain"));
+	    when AppPGP => -- application/pgp
+	       Echo_Out("Content-Type: application/pgp; format=text; x-action=sign",
+			Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: application/pgp; format=text; x-action=sign"));
+	    when Multipart => -- RFC2015 multipart
+			      -- This is the _really_ nasty one.
+			      -- At this point, we have QP_File, the quoted-printable, and TDS_File, then detached signature.
+	       declare
+		  Blk2   : constant String := Temp_File_Name("mp2");
+		  MC     : constant String := Temp_File_Name("mc");
+	       begin
+		  Externals.Mail.Mimeconstruct_Subpart(Infile       => TDS_File,
+						       Outfile      => Blk2,
+						       Content_Type => "application/pgp-signature",
+						       Dos2UnixU    => False,
+						       Use_Encoding => False,
+						       Attachment_Name => "signature.asc",
+						       Disposition => Externals.Mail.Attachment);
+		  Externals.Mail.Mimeconstruct2(Part1_Filename  => QP_File,
+						Part2_Filename  => Blk2,
+						Output_Filename => MC,
+						Content_Type    => "multipart/signed; protocol=""application/pgp-signature""; micalg="""
+						  & Externals.GPG.Micalg_From_Filename(TDS_File)
+						  & """",
+						Prolog          => "This is an OpenPGP/MIME signed message (RFC2440, RFC3156).");
+		  -- Now we need to split these up.
+		  Mail.Extract_Content_Type_From_Header(MC, Mimefile);
+		  New_Headers.Append(Read_Fold(Mimefile));
+		  Mail.Extract_Body(MC, Tmpfile);
+	       end;
+	    when MultipartEncap =>
+	       Error("Menu should not have allowed MultipartEncap here");
+	    when SMIME =>
+	       if SMIME_Opaque = Yes then
+		  declare
+		     MM   : constant String := Temp_File_Name("mm");
+		     MM2  : constant String := Temp_File_Name("mm2");
+		  begin
+		     -- Write an opaque signed message.
+		     -- We've got TDS file which is just a base64 blob.
+		     if Actual_Send then
+			New_Headers.Append(ToUBS("Content-Type: application/pkcs7-mime; smime-type=signed-data; name=""smime.p7s"""));
+			New_Headers.Append(ToUBS("Content-Transfer-Encoding: base64"));
+			New_Headers.Append(ToUBS("Content-Disposition: attachment; filename=""smime.p7s"""));
+			New_Headers.Append(ToUBS("Content-Description: S/MIME cryptographically signed message"));
+			Externals.Simple.Mv_F(TDS_File, Tmpfile);
+		     else
+			Echo_Out("Content-Type: application/pkcs7-mime; smime-type=signed-data; name=""smime.p7s""",
+				 MM);
+			Echo_Append("Content-Transfer-Encoding: base64",
+				    MM);
+			Echo_Append("Content-Disposition: attachment; filename=""smime.p7s""",
+				    MM);
+			Echo_Append("Content-Description: S/MIME cryptographically signed message",
+				    MM);
+			Echo_Append("", MM);
+			Cat_Append(TDS_File, MM);
+			Mail.Mimeconstruct_Mixed(UBS_Array'(1 => ToUBS(MM)),
+						 MM2);

topal-package-76.tgz/sending-encrypt.adb Added

@@ -0,0 +1,198 @@
+-- Topal: GPG/GnuPG and Alpine/Pine integration
+-- Copyright (C) 2001--2015  Phillip J. Brooke
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License version 3 as
+-- published by the Free Software Foundation.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+separate(Sending)
+procedure Encrypt (Tmpfile   : in String;
+		   Non_Pine  : in Boolean;
+		   Mime      : in Boolean;
+		   Mimefile  : in String;
+		   Send_Keys : in Keys.Key_List;
+		   Selection : in Send_Modes;
+		   Mime_Selection : in MIME_Modes;
+		   AL        : in Attachments.Attachment_List;
+		   Hdrfile   : in String;
+		   Recipients : in UBS_Array;
+		   Actual_Send : in Boolean;
+		   New_Headers : out UVV) is
+   Out_File       : constant String := Temp_File_Name("out");
+   SFD_File       : constant String := Temp_File_Name("sfd");
+   -- PCT = Prepend content-type.
+begin
+   if Mime then
+      begin
+	 Ada.Text_IO.New_Line(3);
+	 if Mime_Selection = Multipart 
+	   or Mime_Selection = SMIME then
+	    declare
+	       PCT : constant String := Temp_File_Name("pct");
+	    begin
+	       Echo_Out("Content-Type: " & The_Content_Type(Hdrfile, Actual_Send), PCT);
+	       Echo_Append("", PCT);
+	       Cat_Append(Tmpfile, PCT);
+	       Mv_F(PCT, Tmpfile);
+	       -- Call out to attachments in case we have to modify Tmpfile.
+	       Attachments.Replace_Tmpfile(Tmpfile, AL);
+	    end;
+	 end if;
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Encrypt (MIME block 1)");
+	    raise;
+      end;
+   end if;
+
+   begin
+      if Mime_Selection = SMIME then
+	 -- Run GPG.
+	 Externals.GPG.GPGSM_Wrap_Encrypt(Out_File,
+					  SFD_File,
+					  Tmpfile,
+					  Send_Keys);
+      else
+	 -- Run GPG.
+	 Externals.GPG.GPG_Wrap(" --armor --encrypt "
+				  & " "
+				  & " --output "
+				  & Out_File
+				  & " "
+				  & Keys.Processed_Recipient_List(Send_Keys)
+				  & " "
+				  & Tmpfile,
+				Out_File,
+			        SFD_File);
+      end if;
+   exception
+      when others =>
+	 Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+			      "Exception raised in Sending.Encrypt (GPG block)");
+	 raise;
+   end;
+
+   begin
+      if Selection = EncryptPO then
+	 -- Rename the file appropriately.
+	 Mv_F(Out_File, Tmpfile & ".asc");
+      elsif Mime_Selection /= SMIME then
+	 -- See later coments in S/MIME bit.  Really, we'd like to
+	 --  just send Out_File as Tmpfile for that case, too, but we
+	 --  need to wrap it as a multipart/mixed file.
+	 Mv_F(Out_File, Tmpfile);
+      end if;
+   exception
+      when others =>
+	 Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+			      "Exception raised in Sending.Encrypt (mv block)");
+	 raise;
+   end;
+
+   if Mime then
+      begin
+	 case Mime_Selection is
+	    when InlinePlain => -- Inline plain text
+	       Echo_Out("Content-Type: text/plain",
+			Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: text/plain"));
+	    when AppPGP => -- application/pgp
+	       Echo_Out_N("Content-Type: application/pgp; format=text; x-action=encrypt ",
+			  Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: application/pgp; format=text; x-action=encrypt "));
+	    when Multipart => -- RFC2015 multipart
+			      -- This is the nasty one.
+	       declare
+		  Blk1   : constant String := Temp_File_Name("mp1");
+		  Blk2   : constant String := Temp_File_Name("mp2");
+		  MC     : constant String := Temp_File_Name("mc");
+	       begin
+		  -- We first create the two blocks.
+		  -- The first block is easy:
+		  Echo_Out("Content-Type: application/pgp-encrypted",
+			   Blk1);
+		  Echo_Append("", Blk1);
+		  Echo_Append("Version: 1", Blk1);
+		  -- The second block starts with a
+		  -- content-type, then is the tmpfile we've
+		  -- put together.
+		  Echo_Out("Content-Type: application/octet-stream",
+			   Blk2);
+		  Echo_Append("Content-Disposition: attachment; filename=""message.asc""", Blk2);
+		  Echo_Append("", Blk2);
+		  Cat_Append(Tmpfile, Blk2);
+		  -- Now we put them together.
+		  Externals.Mail.Mimeconstruct2(Part1_Filename  => Blk1,
+						Part2_Filename  => Blk2,
+						Output_Filename => MC,
+						Content_Type    => "multipart/encrypted; protocol=""application/pgp-encrypted""",
+						Prolog          => "This is an OpenPGP/MIME encrypted message (RFC2440, RFC3156).");
+		  -- Now we need to split these up.
+		  Mail.Extract_Content_Type_From_Header(MC, Mimefile);
+		  New_Headers.Append(Read_Fold(Mimefile));
+		  Mail.Extract_Body(MC, Tmpfile);
+	       end;
+	    when MultipartEncap =>
+	       Error("Menu should not have allowed MultipartEncap here");
+	    when SMIME =>
+	       -- At this point, we've got Out_File.  We want it to be
+	       --  CTE b64 and "Content-Type: application/pkcs7-mime;
+	       --  smime-type=enveloped-data; name=""smime.p7m".
+	       -- So we produce a single multipart mixed blob instead.
+	       declare
+		  MM   : constant String := Temp_File_Name("mm");
+		  MM2  : constant String := Temp_File_Name("mm2");
+	       begin
+		  if Actual_Send then
+		     New_Headers.Append(ToUBS("Content-Type: application/pkcs7-mime; smime-type=enveloped-data; name=""smime.p7m"""));
+		     New_Headers.Append(ToUBS("Content-Transfer-Encoding: base64"));
+		     New_Headers.Append(ToUBS("Content-Disposition: attachment; filename=""smime.p7m"""));
+		     New_Headers.Append(ToUBS("Content-Description: S/MIME cryptographically encrypted message"));
+		     Externals.Simple.Mv_F(Out_File, Tmpfile);
+		  else
+		     Echo_Out("Content-Type: application/pkcs7-mime; smime-type=enveloped-data; name=""smime.p7m""",
+			      MM);
+		     Echo_Append("Content-Transfer-Encoding: base64",
+				 MM);
+		     Echo_Append("Content-Disposition: attachment; filename=""smime.p7m""",
+				 MM);
+		     Echo_Append("Content-Description: S/MIME cryptographically encrypted message",
+				 MM);
+		     Echo_Append("", MM);
+		     Cat_Append(Out_File, MM);
+		     Mail.Mimeconstruct_Mixed(UBS_Array'(1 => ToUBS(MM)),
+					      MM2);
+		     Mail.Extract_Content_Type_From_Header(MM2, Mimefile);
+		     New_Headers.Append(Read_Fold(Mimefile));
+		     Mail.Extract_Body(MM2, Tmpfile);
+		  end if;
+	       end;
+	 end case;
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Encrypt (MIME block 2)");
+	    raise;
+      end;
+   end if;
+   
+   if not Actual_Send then
+      Check_Send(Tmpfile, Non_Pine, Mime, Mimefile, Hdrfile, Recipients);
+   end if;
+
+exception
+   when others =>
+      Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+			   "Exception raised in Sending.Encrypt");
+      raise;
+end Encrypt;
+

topal-package-76.tgz/sending-sign_encrypt.adb Added

@@ -0,0 +1,308 @@
+-- Topal: GPG/GnuPG and Alpine/Pine integration
+-- Copyright (C) 2001--2015  Phillip J. Brooke
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License version 3 as
+-- published by the Free Software Foundation.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+separate(Sending)
+procedure Sign_Encrypt  (Tmpfile   : in String;
+			 Non_Pine  : in Boolean;
+			 Mime      : in Boolean;
+			 Mimefile  : in String;
+			 Send_Keys : in Keys.Key_List;
+			 Selection : in Send_Modes;
+			 Mime_Selection : in MIME_Modes;
+			 AL        : in Attachments.Attachment_List;
+			 Hdrfile   : in String;
+			 Recipients : in UBS_Array;
+			 Actual_Send : in Boolean;
+			 New_Headers : out UVV;
+			 AS_Content_Type : in String) is
+   Out_File       : constant String   := Temp_File_Name("out");
+   SFD_File       : constant String   := Temp_File_Name("sfd");
+   SFD2_File      : constant String   := Temp_File_Name("sfd2");
+   QP_File        : constant String   := Temp_File_Name("qp");
+   TDS_File       : constant String   := Temp_File_Name("tds");
+begin
+   -- Run GPG.
+   if Mime and then (Mime_Selection = MultipartEncap 
+		       or Mime_Selection = SMIME) Then
+      -- We need to do something different with Tmpfile.
+      -- First, we delete all trailing blank lines.
+      begin
+	 Prepare_For_Clearsign(Tmpfile,
+			       QP_File,
+			       AS_Content_Type);
+	 -- Call out to attachments in case we have to modify QP_File.
+	 Attachments.Replace_Tmpfile(QP_File, AL);
+	 -- Then we clearsign it.
+	 if Mime_Selection = SMIME then
+	    Externals.GPG.GPGSM_Wrap(" --base64 --sign --local-user "
+				     & Value_Nonempty(Config.UBS_Opts(my_key))
+				     & " "
+				     & " --output "
+				     & TDS_File
+				     & " "
+				     & QP_File,
+				   TDS_File,
+				   SFD_File);
+	 else
+	    Externals.GPG.GPG_Wrap(" --detach-sign --textmode --armor --local-user "
+				     & Value_Nonempty(Config.UBS_Opts(my_key))
+				     & " "
+				     & UGA_Str(Signing => True)
+				     & " --output "
+				     & TDS_File
+				     & " "
+				     & QP_File,
+				   TDS_File,
+				   SFD_File);
+	 end if;
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Sign_Encrypt (GPG MIME/4 block)");
+	    raise;
+      end;
+
+   else
+
+      if Mime and then Mime_Selection = Multipart then
+	 -- We need to do something different with Tmpfile.
+	 -- First, we delete all trailing blank lines.
+	 begin
+	    Prepare_For_Clearsign(Tmpfile,
+				  QP_File,
+				  AS_Content_Type);
+	    -- Call out to attachments in case we have to modify QP_File.
+	    Attachments.Replace_Tmpfile(QP_File, AL);
+	    -- Then rename QP_File to Tmpfile...
+	    Mv_F(QP_File, Tmpfile);
+	 exception
+	    when others =>
+	       Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				    "Exception raised in Sending.Sign_Encrypt (Pre-GPG MIME/3 block)");
+	       raise;
+	 end;
+      end if;
+
+      begin
+	 Externals.GPG.GPG_Wrap(" --encrypt --sign --textmode --armor --local-user "
+				  & Value_Nonempty(Config.UBS_Opts(my_key))
+				  & " "
+				  & UGA_Str(Signing => True)
+				  & " --output "
+				  & Out_File
+				  & " "
+				  & Keys.Processed_Recipient_List(Send_Keys)
+				  & " "
+				  & Tmpfile,
+				Out_File,
+			        SFD_File);
+      exception
+	 when others =>
+	    Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+				 "Exception raised in Sending.Sign_Encrypt (GPG block)");
+	    raise;
+      end;
+
+   end if;
+
+   begin
+      if not (Mime and then (Mime_Selection = MultipartEncap
+			       or Mime_Selection = SMIME)) then
+	 if Selection = SignEncryptPO then
+	    -- Rename the file appropriately.
+	    Mv_F(Out_File, Tmpfile & ".asc");
+	 else
+	    Mv_F(Out_File, Tmpfile);
+	 end if;
+      end if;
+   exception
+      when others =>
+	 Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
+			      "Exception raised in Sending.Sign_Encrypt (MV block)");
+	 raise;
+   end;
+
+   begin
+      if Mime then
+	 case Mime_Selection is
+	    when InlinePlain => -- Inline plain text
+	       Echo_Out("Content-Type: text/plain",
+			Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: text/plain"));
+	    when AppPGP => -- application/pgp
+	       Echo_Out("Content-Type: application/pgp; format=text; x-action=encrypt",
+			Mimefile);
+	       New_Headers.Append(ToUBS("Content-Type: application/pgp; format=text; x-action=encrypt"));
+	    when Multipart => -- RFC2015 multipart
+			      -- This is the nasty one.
+			      -- We are using the combined method allowed in section 6.2.
+	       declare
+		  Blk1   : constant String := Temp_File_Name("mp1");
+		  Blk2   : constant String := Temp_File_Name("mp2");
+		  MC     : constant String := Temp_File_Name("mc");
+	       begin
+		  -- We first create the two blocks.
+		  -- The first block is easy:
+		  Echo_Out("Content-Type: application/pgp-encrypted",
+			   Blk1);
+		  Echo_Append("", Blk1);
+		  Echo_Append("Version: 1", Blk1);
+		  -- The second block starts with a
+		  -- content-type, then is the tmpfile we've
+		  -- put together.
+		  Echo_Out("Content-Type: application/octet-stream",
+			   Blk2);
+		  Echo_Append("Content-Disposition: attachment; filename=""message.asc""", Blk2);
+		  Echo_Append("", Blk2);
+		  Cat_Append(Tmpfile, Blk2);
+		  -- Now we put them together.
+		  Externals.Mail.Mimeconstruct2(Part1_Filename  => Blk1,
+						Part2_Filename  => Blk2,
+						Output_Filename => MC,
+						Content_Type    => "multipart/encrypted; protocol=""application/pgp-encrypted""",
+						Prolog          => "This is an OpenPGP/MIME encrypted message (RFC2440, RFC3156).");
+		  -- Now we need to split these up.
+		  Mail.Extract_Content_Type_From_Header(MC, Mimefile);
+		  New_Headers.Append(Read_Fold(Mimefile));
+		  Mail.Extract_Body(MC, Tmpfile);
+	       end;
+	    when MultipartEncap => -- RFC2015 multipart encapsulated
+				   -- This is the REALLY nasty one.  We are
+				   -- encapsulating, so we have to sign then
+				   -- encrypt.
+	       declare
+		  Blk1   : constant String := Temp_File_Name("mp1");
+		  Blk2   : constant String := Temp_File_Name("mp2");
+		  MCS    : constant String := Temp_File_Name("mcs");
+		  MC     : constant String := Temp_File_Name("mc");
+	       begin
+		  -- We first create the two blocks.
+		  Externals.Mail.Mimeconstruct_Subpart(Infile       => TDS_File,
+						       Outfile      => Blk2,
+						       Content_Type => "application/pgp-signature",
+						       Dos2UnixU    => False,
+						       Use_Encoding => False,
+						       Attachment_Name => "signature.asc",
+						       Disposition => Externals.Mail.Attachment);
+		  Externals.Mail.Mimeconstruct2(Part1_Filename  => QP_File,

topal-package-72.tgz/sending.adb -> topal-package-76.tgz/sending.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -15,6 +15,8 @@
 
 with Ada.Command_Line;
 with Ada.Strings.Fixed;
+with Ada.Strings.Maps.Constants;
+with Ada.Strings.Unbounded;
 with Ada.Text_IO;
 with Configuration;
 with Attachments;
@@ -44,17 +46,19 @@
      := (InlinePlain    => "Inline plain          ",
          AppPGP         => "Application/PGP       ",
          Multipart      => "Multipart             ",
-         MultipartEncap => "Multipart encapsulated");
+         MultipartEncap => "Multipart encapsulated",
+         SMIME          => "SMIME CMS (not GPG)   ");
 
    Exit_Send_Loop : exception; -- Subroutine says `bail out, please'.
-
+   
    procedure Key_Preselect (K          : in out Keys.Key_List;
                             Recipients : in     UBS_Array;
-                            Alt_Sign   : in     String       := "";
-                            Missing    :    out Boolean) is
+                            Alt_Sign   : in     String;
+                            Missing    :    out Boolean;
+			    SMIME      : in     Boolean) is
    begin
       -- Can we preselect any keys?
-      Keys.Empty_Keylist(K);
+      Keys.Empty_Keylist(K, SMIME);
       Keys.Use_Keylist(Recipients, K, Missing);
       -- Add our own key.  If Alt_Sign is non-empty, then try and add
       --  keys for that instead.
@@ -66,27 +70,27 @@
       begin
          if Alt_Sign /= "" then
             Ada.Text_IO.Put_Line("Looking for signing key for `"&Alt_Sign&"' on SAKE list...");
-            for J in 1..Config.SAKE_Count loop
-               if ToStr(UAP.Value(Config.SAKE_Email, J)) = Alt_Sign then
-                  Keys.Add_Keys_By_Fingerprint(UAP.Value(Config.SAKE_Key, J),
+            for J in 1..Integer(Config.SAKE.Length) loop
+               if EqualCI(Config.SAKE.Element(J).Value, Alt_Sign) then
+                  Keys.Add_Keys_By_Fingerprint(Config.SAKE.Element(J).Key,
                                                K, Keys.Both, Found);
                   if Found then
                      Ada.Text_IO.Put_Line(Do_SGR(Config.UBS_Opts(Colour_Important))
-                                            & "Added key `"&ToStr(UAP.Value(Config.SAKE_Key, J))&"' for signing..."
+                                            & "Added key `"&ToStr(Config.SAKE.Element(J).Key)&"' for signing..."
                                          & Reset_SGR);
-                     Config.UBS_Opts(My_Key) := UAP.Value(Config.SAKE_Key, J);
+                     Config.UBS_Opts(My_Key) := Config.SAKE.Element(J).Key;
                   else
                      -- Try again, but only as an encryptor.
-                     Keys.Add_Keys_By_Fingerprint(UAP.Value(Config.SAKE_Key, J),
+                     Keys.Add_Keys_By_Fingerprint(Config.SAKE.Element(J).Key,
                                                   K, Keys.Encrypter, Found);
                      if Found then
                         Ada.Text_IO.Put_Line(Do_SGR(Config.UBS_Opts(Colour_Important))
-                                               & "Added own key `"&ToStr(UAP.Value(Config.SAKE_Key, J))&"' BUT only as encryptor..."
+                                               & "Added own key `"&ToStr(Config.SAKE.Element(J).Key)&"' BUT only as encryptor..."
                                                & Reset_SGR);
                         -- We'll not change My_Key here.
                      else
                         Ada.Text_IO.Put_Line(Do_SGR(Config.UBS_Opts(Colour_Important))
-                                               & "Couldn't add key `"&ToStr(UAP.Value(Config.SAKE_Key, J))&"' for signing..."
+                                               & "Couldn't add key `"&ToStr(Config.SAKE.Element(J).Key)&"' for signing..."
                                                & Reset_SGR);
                      end if;
                   end if;
@@ -94,14 +98,14 @@
             end loop;
          end if;
          if Alt_Sign /= "" and (not Found) then
-            Keys.Empty_Keylist(AKL);
+            Keys.Empty_Keylist(AKL, SMIME);
             Ada.Text_IO.Put_Line("Looking for signing key for `"&Alt_Sign&"' via keyring (& XK list)...");
             Keys.Add_Secret_Keys(ToUBS(Alt_Sign),
                                  AKL,
                                  Keys.Both);
             -- Any keys to remove on the SXK list?
-            for J in 1..Config.SXK_Count loop
-               Keys.Remove_Key(UAP.Value(Config.SXK_Key, J), AKL);
+            for J in 1..Integer(Config.SXK.Length) loop
+               Keys.Remove_Key(Config.SXK.Element(J), AKL);
             end loop;
             KC := Keys.Count(AKL);
             Found := KC > 0;
@@ -170,8 +174,8 @@
          raise;
    end Key_Preselect;
 
-   procedure Mode_Preselect (K          : in Keys.Key_List;
-                             Recipients : in UBS_Array;
+   procedure Mode_Preselect (K          : in     Keys.Key_List;
+                             Recipients : in     UBS_Array;
                              SI         :    out Send_Modes;
                              MI         :    out MIME_Modes) is
       procedure Set_I (S : in UBS) is
@@ -186,6 +190,7 @@
          if Index(S2, "A") /= 0 then MI := AppPGP; end if;
          if Index(S2, "M") /= 0 then MI := Multipart; end if;
          if Index(S2, "E") /= 0 then MI := MultipartEncap; end if;
+         if Index(S2, "P") /= 0 then MI := SMIME; end if;
       end Set_I;
 
       use type UBS;
@@ -194,22 +199,22 @@
       MI := InlinePlain;
       -- Consider each SD item.  We do them in this order so that
       --  later overrides earlier.
-      for J in 1..Config.SD_Count loop
-         if ToStr(UAP.Value(Config.SD_KE, J)) = "@ANY@" then
+      for J in 1..Integer(Config.SD.Length) loop
+         if EqualCI(Config.SD.Element(J).Key, "@ANY@") then
             -- User default!
-            Set_I(UAP.Value(Config.SD_Mode, J));
-         elsif Ada.Strings.Fixed.Index(ToStr(UAP.Value(Config.SD_KE, J)), "@") /= 0 then
+            Set_I(Config.SD.Element(J).Value);
+         elsif Ada.Strings.Fixed.Index(ToStr(Config.SD.Element(J).Key), "@") /= 0 then
             -- Is it an email address?  If so...
             -- Do any recipients match?
             for I in Recipients'Range loop
-               if UAP.Value(Config.SD_KE, J) = Recipients(I) then
-                  Set_I(UAP.Value(Config.SD_Mode, J));
+               if EqualCI(Config.SD.Element(J).Key, Recipients(I)) then
+                  Set_I(Config.SD.Element(J).Value);
                end if;
             end loop;
          else
             -- Do any keys match?
-            if Keys.Contains(K, UAP.Value(Config.SD_KE, J)) then
-               Set_I(UAP.Value(Config.SD_Mode, J));
+            if Keys.Contains(K, Config.SD.Element(J).Key) then
+               Set_I(Config.SD.Element(J).Value);
             end if;
          end if;
       end loop;
@@ -230,29 +235,113 @@
          raise;
    end Mode_Preselect;
 
-   function The_Content_Type return String is
+   function The_Content_Type(Hdrfile     : in String;
+			     Actual_Send : in Boolean) return String is
       -- What is the content type for outbound messages?  (at least,
       --  the bit we're bothered about)
       Current_Charset : UBS;
    begin
-      Current_Charset := ToUBS(Externals.Simple.Get_Charmap);
-      return "text/plain; charset=""" & ToStr(Current_Charset) & """";
+      if Actual_Send then
+	 -- Extract if from the Hdrfile.
+	 declare
+	    CTfile : constant String := Temp_File_Name("hdrct");
+	 begin
+	    Mail.Extract_Content_Type_From_Header(Hdrfile, CTfile);
+	    declare
+	       CT : constant String := ToStr(Read_Fold(CTfile));
+	    begin
+	       -- Dump characters 1..14 (as they say "Content-Type: ").
+	       return CT(15..CT'Last);
+	    end;
+	 end;
+      else
+	 Current_Charset := ToUBS(Externals.Simple.Get_Charmap);
+	 return "text/plain; charset=""" & ToStr(Current_Charset) & """";
+      end if;
    exception
       when others =>
          Ada.Text_IO.Put_Line(Ada.Text_IO.Standard_Error,
                               "Exception raised in Sending.The_Content_Type");
          raise;
-   end;
+   end The_Content_Type;
 
+   function Get_Recipients (Tmpfile : String) return UBS_Array_Pointer is
+      Hdrfile        : constant String := Temp_File_Name("hdr");
+      Tofile         : constant String := Temp_File_Name("to");
+      Ccfile         : constant String := Temp_File_Name("cc");
+      Bccfile        : constant String := Temp_File_Name("bcc");
+      R              : UVV;
+      
+      procedure Read_Lines (File : in String) is
+	 use Ada.Text_IO;
+	 F : File_Type;
+      begin
+	 Open(File => F,
+	      Mode => In_File,
+	      Name => File);
+     Read_Loop:
+	 loop
+	    exit Read_Loop when End_Of_File(F);

topal-package-72.tgz/sending.ads -> topal-package-76.tgz/sending.ads Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2008  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -18,11 +18,13 @@
 package Sending is
 
    -- We want to send a message.
-   procedure Send (Tmpfile    : in String;
-                   Recipients : in UBS_Array;
-                   Non_Pine   : in Boolean   := False;
-                   Mime       : in Boolean   := False;
-                   Mimefile   : in String    := "");
+   procedure Send (Tmpfile     : in String;
+                   Recipients  : in UBS_Array;
+		   Remaining   : in UBS_Array := UBS_Array'(1..0 => ToUBS(""));
+                   Non_Pine    : in Boolean   := False;
+                   Mime        : in Boolean   := False;
+                   Mimefile    : in String    := "";
+		   Actual_Send : in Boolean   := False);
 
    -- Make sure the user really wants to send this.
    procedure Check_Send (Tmpfile   : in String;
@@ -30,6 +32,12 @@
                          Mime      : in Boolean;
                          Mimefile  : in String;
                          Hdrfile   : in String;
-                         Recipients : in UBS_Array);
-
+                         Recipients : in UBS_Array;
+			 Actual_Send : in Boolean := False;
+			 Send_Comment : in String := "");
+   
+   -- Pre-processing for the sendmail-path filter.
+   -- We assume that Tmpfile contains both header & body.
+   function Get_Recipients (Tmpfile : String) return UBS_Array_Pointer;
+   
 end Sending;

topal-package-72.tgz/topal.adb -> topal-package-76.tgz/topal.adb Changed

@@ -1,5 +1,5 @@
 -- Topal: GPG/GnuPG and Alpine/Pine integration
--- Copyright (C) 2001--2010  Phillip J. Brooke
+-- Copyright (C) 2001--2015  Phillip J. Brooke
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License version 3 as
@@ -14,11 +14,14 @@
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 with Ada.Command_Line;
+with Ada.Environment_Variables;
 with Ada.Exceptions;
 with Ada.Text_IO;
 with Configuration;
 with Echo;
 with Externals;
+with Externals.Mail;
+with Externals.Ops;
 with Externals.Simple;
 with Invocation;
 with Globals;               use Globals;
@@ -48,8 +51,8 @@
    -- Get our PID.
    Our_PID := Externals.C_Get_Process_ID;
    -- Set defaults.
-   Topal_Directory := ToUBS(Externals.Get_Env("HOME")
-                            & "/.topal");
+   Topal_Directory := ToUBS(Ada.Environment_Variables.Value("HOME")
+			      & "/.topal");
    -- Load history and config.
    Configuration.Default_Configuration(Config);
    Readline.Load_History;
@@ -85,6 +88,9 @@
          Disclaimer;
          Receiving.Mime_Display_APGP(Infile       => ToStr(Infile),
                                      Content_Type => ToStr(Content_Type));
+      when Raw_Input =>
+	 Disclaimer;
+	 Receiving.Process_Stdin;
       when Inline_Send =>
          Externals.Simple.Clear;
          Disclaimer;
@@ -101,6 +107,32 @@
                       Mime       => True,
                       Mimefile   => ToStr(Mimefile),
                       Recipients => Recipients.all);
+      when Actual_Send =>
+	 -- Eat the input into a tempfile.
+	 declare
+	    Stdin_Name : constant String := Temp_File_Name("tmpfile");
+	    Dummy_Mimefile : constant String := Temp_File_Name("mimefile");
+	 begin
+	    -- Catch standard input.
+	    Externals.Simple.Cat_Stdin_Out(Stdin_Name);
+	    -- Figure out the new recipients.
+	    Recipients := Sending.Get_Recipients(Stdin_Name);
+	    -- Now we want to open /dev/tty and use that as stdin.
+	    Externals.Ops.Open_TTY;
+	    Echo.Save_Terminal;
+	    Echo.Set_Echo;
+	    Externals.Simple.Stty_Sane;
+	    -- Now show the disclaimer, etc.
+	    Externals.Simple.Clear;
+	    Disclaimer;
+	    Report_Config_Warnings;
+	    Sending.Send(Tmpfile     => Stdin_Name,
+			 Mime        => True,
+			 Mimefile    => Dummy_Mimefile,
+			 Recipients  => Recipients.all,
+			 Remaining   => Remaining.all,
+			 Actual_Send => True);
+	 end;
       when Nonpine_Send =>
          Disclaimer;
          -- Does the first object exist as a readable file?
@@ -173,6 +205,10 @@
       when Fix_Folders =>
          Disclaimer;
          Workaround.Fix_Folders(Folders => Folders.all);
+      when Check_Send_Token =>
+	 -- This is running as a filter.
+	 Externals.Mail.Check_Send_Token(ToStr(CST_Token));
+	 Ada.Command_Line.Set_Exit_Status(Ada.Command_Line.Success);
       when Server =>
          Disclaimer;
          -- Now accept connections....
@@ -181,9 +217,12 @@
    if not Config.Boolean_Opts(No_Clean) then
       Externals.Simple.Rm_Tempfiles_PID;
    end if;
-   if Run_Mode /= Fix_Email then
+   if Run_Mode /= Fix_Email and Run_Mode /= Check_Send_Token then
       -- Only do this with a real console.  This is nasty.
       Echo.Set_Echo;
+      if Run_Mode = Actual_Send then
+	 Echo.Restore_Terminal;
+      end if;
    end if;
    Readline.Save_History;
    Close_Result_File;
@@ -193,6 +232,9 @@
       Ada.Command_Line.Set_Exit_Status(Ada.Command_Line.Failure);
       Echo.Set_Echo;
       Externals.Simple.Stty_Sane;
+      if Run_Mode = Actual_Send then
+	 Echo.Restore_Terminal;
+      end if;
       if not Config.Boolean_Opts(No_Clean) then
          Externals.Simple.Rm_Tempfiles_PID;
       end if;
@@ -228,7 +270,7 @@
          Put_Line(Standard_Error,
                     "This is not good: please send a bug report with the information above to "
                     &NL&
-                    "pjb@lothlann.freeserve.co.uk (unless it was caused by ctrl-c when GPG was"
+                    "p.j.brooke@bcs.org.uk (unless it was caused by ctrl-c when GPG was"
                     &NL&
                     "running).  Tell me *exactly* what you were doing when it crashed."
                     &NL&
@@ -241,6 +283,9 @@
       -- Clean up terminal settings.
       Echo.Set_Echo;
       Externals.Simple.Stty_Sane;
+      if Run_Mode = Actual_Send then
+	 Echo.Restore_Terminal;
+      end if;
       if not Config.Boolean_Opts(No_Clean) then
          Externals.Simple.Rm_Tempfiles_PID;
       end if;

topal-package-72.tgz/topal.man -> topal-package-76.tgz/topal.man Changed

topal-package-76.tgz/topal.pdf Added

topal-package-76.tgz/topal.tex Added

@@ -0,0 +1,1451 @@
+% Topal: GPG/GnuPG and Alpine/Pine integration
+% Copyright (C) 2001--2015  Phillip J. Brooke
+% 
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License version 3 as
+% published by the Free Software Foundation.
+% 
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+% 
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\documentclass[a4paper,twoside,12pt,openright]{report}
+
+\usepackage[utf8]{inputenc}
+\usepackage{palatino,fancyhdr,amssymb,textcomp,txfonts,paralist}
+\newcommand{\eg}{\textit{e.g.}}
+\newcommand{\etc}{\textit{etc.}}
+\newcommand{\ie}{\textit{i.e.}}
+\newcommand{\vv}{\textit{vice versa}}
+\usepackage[hyphens]{url}
+\usepackage{hyphenat}
+\usepackage{graphicx}
+\renewcommand\familydefault{\sfdefault}
+\usepackage{listings}
+\lstset{language=,columns=fullflexible,escapechar=\%,keepspaces=true}
+\lstset{basicstyle=\small\ttfamily}
+\lstdefinestyle{type}{backgroundcolor=\color{green},showspaces=true}
+\lstdefinestyle{response}{backgroundcolor=\color{yellow}}
+
+\input{versionid.tex}
+
+% Don't like Courier.
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage{beramono}
+
+\newcommand{\vefill}{\vspace*{\fill}}
+
+\newcounter{saveenumi}
+\newcommand{\saveenumi}{\setcounter{saveenumi}{\theenumi}}
+\newcommand{\restoreenumi}{\setcounter{enumi}{\thesaveenumi}}
+
+\newenvironment{enumerateleg}{\begin{enumerate}[(a)]}{\end{enumerate}}
+
+\newlength{\Oldparindent}
+\setlength{\Oldparindent}{\parindent}
+
+% Maxwidth, from http://www.tex.ac.uk/cgi-bin/texfaq2html?label=grmaxwidth
+\makeatletter
+\def\maxwidth{%
+  \ifdim\Gin@nat@width>0.9\linewidth
+    0.9\linewidth
+  \else
+    \Gin@nat@width
+  \fi
+}
+\makeatother
+
+% Screenshot figures.  The filename and the caption.
+\newcommand{\SSF}[2]{
+\begin{figure}[htp!]
+\centering
+\fbox{\parbox{0.9\linewidth}{  \centering
+  \includegraphics[width=\maxwidth]{screens/#1}
+  \caption{#2}\label{fig:#1}}}
+
+\end{figure}
+(figure~\ref{fig:#1})}
+
+\usepackage[bookmarksopen=true,bookmarksopenlevel=1,
+  bookmarksnumbered=true,
+  colorlinks=true, urlcolor=blue,
+  breaklinks=true,
+  pdftitle={Topal manual},
+  pdfauthor={Phil Brooke},
+  pdfsubject={Topal},
+  pdfkeywords={Topal, Pine, Alpine, OpenPGP, SMIME, GnuPG}
+]{hyperref}
+
+% Footing.
+\fancyfoot{}
+\fancyfoot[RO,LE]{\thepage}
+
+
+\begin{document}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Title page/front cover
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\pagestyle{empty}
+
+\begin{titlepage}
+
+  \pdfbookmark[1]{Title page}{pdf:titlePage}
+  \setlength{\parindent}{0pt}
+  \raggedright
+
+  {\Huge\bf\scshape Topal\\\bigskip\large GPG/GnuPG and Alpine/Pine integration}\\[10ex]
+
+
+  {\Large Phil Brooke
+  }
+
+  \vfill
+
+     Release~\TopalRelease\\ 
+     \TopalBuildDate
+
+  \setlength{\parindent}{\Oldparindent}
+
+\end{titlepage}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Inside front cover.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\vefill
+  \setlength{\parindent}{0pt}
+
+  {
+
+
+Topal: GPG/GnuPG and Alpine/Pine integration
+
+Copyright \copyright~ 2001--2015  Phillip J. Brooke
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3 as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see \url{http://www.gnu.org/licenses/}.
+}
+
+  \setlength{\parindent}{\Oldparindent}
+
+
+\cleardoublepage
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Front matter, ToC, LoF, ...
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\pagestyle{fancy}
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead{}
+
+\pagenumbering{roman}
+\setcounter{page}{1}
+
+\pdfbookmark[1]{Table of contents}{pdf:TOC}
+\tableofcontents
+
+\cleardoublepage
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Main matter.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\pagenumbering{arabic}
+\setcounter{page}{1}
+
+
+
+\chapter{Introduction \& features}
+
+Topal is a ‘glue’ program that links 
+\href{http://www.gnupg.org}{GnuPG}
+and 
+\href{http://www.washington.edu/pine/}{Pine}/%
+\href{http://www.washington.edu/alpine/}{Alpine}/%
+\href{http://sourceforge.net/projects/re-alpine/}{``Re-Alpine'' (from
+ Sourceforge)}.
+It offers
+facilities to encrypt, decrypt, sign and verify emails, including
+inline OpenPGP, MIME/OpenPGP and S/MIME.   It
+can also be used directly from the command-line.
+
+\section{Features}
+
+\begin{itemize}
+\item Multiple inline PGP blocks can be processed in display filters.
+\item Decryption and verification output can be cached to reduce the
+  number of times a passphrase is entered\footnote{Note that you should also
+  consider the use of \texttt{gpg-agent}.}.  This also helps when
+  secret keys aren't always available, at the expense of storing
+  decrypted output.

Changes of Revision 4