diff options
author | Eduardo Chappa <chappa@washington.edu> | 2014-12-07 19:42:37 -0700 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2014-12-07 19:42:37 -0700 |
commit | 20d433c77e32dc05c2accf8ab943c2a7d9738239 (patch) | |
tree | 4cf7be2b55ec529067a2867eb29ebcfe6c5758aa /pith/smkeys.h | |
parent | 121a42f3d82c1b98c384857960d14b2057a95c41 (diff) | |
download | alpine-20d433c77e32dc05c2accf8ab943c2a7d9738239.tar.xz |
* new version 2.19.9993
* Aggregate operations allows bouncing a list of messages using a role.
Suggested by Ulf-Dietrich Braumann.
* Compilation error of module pith/reply.c if SMIME is not defined (as in
Windows Alpine). There was a misplaced parenthesis.
* Update to S/MIME to explain how to use a PKCS12 certificate in
Alpine.
* Fix error in compare_certs function, that would modify the name of
the certificates after sorting them, and return when no certificates
are given.
* When replying to several messages, subject will be decoded first,
and then stripped from re/fwd before they are compared to determine
the subject of the replied message.
* Add $(LIBINTL) to the flags to link rpdump, rpload, alpined and
alpineldap because MAC OSX 10.8 x86_64 needs it.
* When the download of an attachment is interrumpted, Alpine stills
caches what was downloaded, making the download incomplete for
subsequent calls of Alpine attempting to open the attachment. In the
future, Alpine will not cache any downloaded part of the attachment
when it is interrupted.
Diffstat (limited to 'pith/smkeys.h')
-rw-r--r-- | pith/smkeys.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pith/smkeys.h b/pith/smkeys.h index 5214a369..37a92a90 100644 --- a/pith/smkeys.h +++ b/pith/smkeys.h @@ -43,6 +43,9 @@ typedef struct personal_cert { struct personal_cert *next; } PERSONAL_CERT; +/* flags that tell us where to look for certificates/keys */ +#define SM_NORMALCERT 0x1 /* look in normal user defined directory */ +#define SM_BACKUPCERT 0x2 /* look in backup directory */ /* exported protoypes */ int add_certs_in_dir(X509_LOOKUP *lookup, char *path, char *ext, CertList **cdata); @@ -51,7 +54,7 @@ PERSONAL_CERT *get_personal_certs(char *d); X509 *get_cert_for(char *email, WhichCerts ctype); void save_cert_for(char *email, X509 *cert, WhichCerts ctype); char **get_x509_subject_email(X509 *x); -EVP_PKEY *load_key(PERSONAL_CERT *pc, char *pass); +EVP_PKEY *load_key(PERSONAL_CERT *pc, char *pass, int flag); CertList *mem_to_certlist(char *contents, WhichCerts ctype); void add_to_end_of_certlist(CertList **cl, char *name, X509 *cert); void free_certlist(CertList **cl); @@ -60,10 +63,9 @@ void free_personal_certs(PERSONAL_CERT **pc); void get_fingerprint(X509 *cert, const EVP_MD *type, char *buf, size_t maxLen, char *s); int certlist_to_file(char *filename, CertList *certlist); int load_cert_for_key(char *pathdir, EVP_PKEY *pkey, char **certfile, X509 **pcert); -char *smime_name(char *email, X509 *x, WhichCerts ctype); char *smime_get_date(ASN1_GENERALIZEDTIME *tm); void resort_certificates(CertList **data, WhichCerts ctype); - +int setup_certs_backup_by_type(WhichCerts ctype); #endif /* PITH_SMKEYS_INCLUDED */ #endif /* SMIME */ |