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/conftype.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/conftype.h')
| -rw-r--r-- | pith/conftype.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pith/conftype.h b/pith/conftype.h index 11fe18f7..d8636b48 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -707,39 +707,37 @@ typedef struct smime_stuff { SmimeHolderType publictype; char *publicpath; char *publiccontent; - CertList *publiccertdata; CertList *publiccertlist; SmimeHolderType privatetype; char *privatepath; char *privatecontent; - CertList *privatecertdata; + CertList *privatecertlist; void *personal_certs; /* this is type (PERSONAL_CERT *) */ SmimeHolderType catype; char *capath; char *cacontent; - CertList *cacertdata; CertList *cacertlist; } SMIME_STUFF_S; -#define DATACERT(X) (((X) == Public ? ps_global->smime->publiccertdata \ - : ((X) == Private ? ps_global->smime->privatecertdata \ - : ((X) == CACert ? ps_global->smime->cacertdata : NULL)))) +#define DATACERT(X) (((X) == Public ? ps_global->smime->publiccertlist \ + : ((X) == Private ? ps_global->smime->privatecertlist \ + : ((X) == CACert ? ps_global->smime->cacertlist : NULL)))) #define PATHCERTDIR(X) (((X) == Public ? ps_global->smime->publicpath \ : ((X) == Private ? ps_global->smime->privatepath \ : ((X) == CACert ? ps_global->smime->capath : NULL)))) +#define CONTENTCERTLIST(X) (((X) == Public ? ps_global->smime->publiccontent \ + : ((X) == Private ? ps_global->smime->privatecontent \ + : ((X) == CACert ? ps_global->smime->cacontent : NULL)))) + #define SMHOLDERTYPE(X) (((X) == Public ? ps_global->smime->publictype \ : ((X) == Private ? ps_global->smime->privatetype \ : ((X) == CACert ? ps_global->smime->catype : Nada)))) -#define SMCERTLIST(X) (((X) == Public ? ps_global->smime->publiccertlist \ - : ((X) == Private ? ps_global->smime->privatecertdata \ - : ((X) == CACert ? ps_global->smime->cacertlist : NULL)))) - #define EXTCERT(X) (((X) == Public ? ".crt" \ : ((X) == Private ? ".key" \ : ((X) == CACert ? ".crt" : NULL)))) |