From fdef7c51110e5ba139c53e3faa72f038e95d02e7 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Fri, 18 Apr 2014 01:04:44 -0600 Subject: * Set default ssl configuration for Homebrew in MAC OSX to /usr/local/etc/openssl, under the advice of Sam Hathaway. * Add management certificate support for containers. * Fix crashing bugs introduced in version 2.19.9, which did not allow alpine to start with the -passfile and use a remote pinerc. Reported by Ulf-Dietrich Braumann. * fix a bug which was introduced in version 2.19.9, where Alpine would free a certificate associated to a key after encryption, and so this could not be used during decryption. We use X509_dup to copy the cert and so make the copy be freed, and not the original. * S/MIME: sign messages using intermediate certificates when needed and possible. --- pith/smime.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pith/smime.h') diff --git a/pith/smime.h b/pith/smime.h index 3d65d924..8acaaa8e 100644 --- a/pith/smime.h +++ b/pith/smime.h @@ -60,14 +60,19 @@ int copy_privatecert_dir_to_container(void); int copy_privatecert_container_to_dir(void); int copy_cacert_dir_to_container(void); int copy_cacert_container_to_dir(void); +int import_certificate(WhichCerts); +int copy_dir_to_container(WhichCerts which, char *contents); #ifdef APPLEKEYCHAIN int copy_publiccert_container_to_keychain(void); int copy_publiccert_keychain_to_container(void); #endif /* APPLEKEYCHAIN */ -int import_certificate(WhichCerts); #ifdef PASSFILE -void setup_pwdcert(void); +void setup_pwdcert(void **pwdcert); #endif /* PASSFILE */ +void mark_cert_deleted(WhichCerts ctype, int num, unsigned state); +unsigned get_cert_deleted(WhichCerts ctype, int num); +int smime_expunge_cert(WhichCerts ctype); +int add_file_to_container(WhichCerts ctype, char *fpath, char *altname); #endif /* PITH_SMIME_INCLUDED */ #endif /* SMIME */ -- cgit v1.2.3-54-g00ecf