diff options
author | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2014-04-18 01:04:44 -0600 |
commit | fdef7c51110e5ba139c53e3faa72f038e95d02e7 (patch) | |
tree | b11f7982b1ac4fed50ae2a16cfc7851cd960ad59 /pith/smime.h | |
parent | caa4e3ccd7c9bf9352434b0f78c7b650338cd4d0 (diff) | |
download | alpine-fdef7c51110e5ba139c53e3faa72f038e95d02e7.tar.xz |
* 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.
Diffstat (limited to 'pith/smime.h')
-rw-r--r-- | pith/smime.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 */ |