X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgplib.c;h=5e6e8215e1d0d1e54acdfac24a4d65403ef426ba;hp=d9e5ff9f53aae23aa9a5d34ae012cd7a6c9103a9;hb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83

diff --git a/lib-crypt/pgplib.c b/lib-crypt/pgplib.c
index d9e5ff9..5e6e821 100644
--- a/lib-crypt/pgplib.c
+++ b/lib-crypt/pgplib.c
@@ -9,19 +9,8 @@
 
 /* Generally useful, pgp-related functions. */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-
-#include <lib-lib/mem.h>
-
-#include "mutt.h"
 #include "lib.h"
 #include "pgplib.h"
 
@@ -45,30 +34,6 @@ const char *pgp_pkalgbytype (unsigned char type)
   }
 }
 
-
-
-/* unused */
-
-#if 0
-
-static const char *hashalgbytype (unsigned char type)
-{
-  switch (type) {
-  case 1:
-    return "MD5";
-  case 2:
-    return "SHA1";
-  case 3:
-    return "RIPE-MD/160";
-  case 4:
-    return "HAVAL";
-  default:
-    return "unknown";
-  }
-}
-
-#endif
-
 short pgp_canencrypt (unsigned char type)
 {
   switch (type) {
@@ -107,7 +72,7 @@ short pgp_get_abilities (unsigned char type)
   return (pgp_canencrypt (type) << 1) | pgp_cansign (type);
 }
 
-void pgp_free_sig (pgp_sig_t ** sigp)
+static void pgp_free_sig (pgp_sig_t ** sigp)
 {
   pgp_sig_t *sp, *q;
 
@@ -122,7 +87,7 @@ void pgp_free_sig (pgp_sig_t ** sigp)
   *sigp = NULL;
 }
 
-void pgp_free_uid (pgp_uid_t ** upp)
+static void pgp_free_uid (pgp_uid_t ** upp)
 {
   pgp_uid_t *up, *q;