diff options
author | Eduardo Chappa <chappa@washington.edu> | 2016-10-05 01:10:52 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2016-10-05 01:10:52 -0600 |
commit | 4f2c1e32cfe0ebcb628c5a55a52eef283aa39446 (patch) | |
tree | 31327e907a51c422e05f91f827bd1b166ce988d5 /pith/smime.h | |
parent | 174c8ccf0d4aae97fc5858d082c58fd5b23402a0 (diff) | |
download | alpine-4f2c1e32cfe0ebcb628c5a55a52eef283aa39446.tar.xz |
* When Alpine is compiled with password file and SMIME support
the password file is encrypted using a private key/public certificate
pair. If one such pair cannot be found, one will be created.
Diffstat (limited to 'pith/smime.h')
-rw-r--r-- | pith/smime.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pith/smime.h b/pith/smime.h index 01e4cdc0..ca92fbca 100644 --- a/pith/smime.h +++ b/pith/smime.h @@ -24,12 +24,14 @@ #include "../pith/filttype.h" #include "../pith/smkeys.h" +#include <openssl/x509.h> #include <openssl/rand.h> #include <openssl/err.h> #ifdef PASSFILE #define DF_PASSWORD_DIR ".alpine-smime/.pwd" #endif +#define DF_SMIMETMPDIR ".alpine-smime/smtmp" #define OUR_PKCS7_ENCLOSURE_SUBTYPE "x-pkcs7-enclosure" @@ -68,14 +70,14 @@ 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 import_certificate(WhichCerts, PERSONAL_CERT *, char *); 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 */ #ifdef PASSFILE -void setup_pwdcert(void **pwdcert); +int setup_pwdcert(void **pwdcert); #endif /* PASSFILE */ void mark_cert_deleted(WhichCerts ctype, int num, unsigned state); unsigned get_cert_deleted(WhichCerts ctype, int num); |