diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ossl_typ.h.patch | 23 | ||||
| -rw-r--r-- | patches/pkcs7.h.patch | 19 | ||||
| -rw-r--r-- | patches/x509.h.patch | 20 |
3 files changed, 62 insertions, 0 deletions
diff --git a/patches/ossl_typ.h.patch b/patches/ossl_typ.h.patch new file mode 100644 index 0000000..af9419a --- /dev/null +++ b/patches/ossl_typ.h.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | --- include/openssl/ossl_typ.h.orig 2015-07-06 13:21:18.788571423 -0700 | ||
| 2 | +++ include/openssl/ossl_typ.h 2015-07-06 13:24:14.906468003 -0700 | ||
| 3 | @@ -100,6 +100,20 @@ | ||
| 4 | typedef struct ASN1_ITEM_st ASN1_ITEM; | ||
| 5 | typedef struct asn1_pctx_st ASN1_PCTX; | ||
| 6 | |||
| 7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | ||
| 8 | +#ifdef _MSC_VER | ||
| 9 | +#pragma message("Warning, overriding WinCrypt defines") | ||
| 10 | +#else | ||
| 11 | +#warning overriding WinCrypt defines | ||
| 12 | +#endif | ||
| 13 | +#undef X509_NAME | ||
| 14 | +#undef X509_CERT_PAIR | ||
| 15 | +#undef X509_EXTENSIONS | ||
| 16 | +#undef OCSP_REQUEST | ||
| 17 | +#undef OCSP_RESPONSE | ||
| 18 | +#undef PKCS7_ISSUER_AND_SERIAL | ||
| 19 | +#endif | ||
| 20 | + | ||
| 21 | #ifdef BIGNUM | ||
| 22 | #undef BIGNUM | ||
| 23 | #endif | ||
diff --git a/patches/pkcs7.h.patch b/patches/pkcs7.h.patch new file mode 100644 index 0000000..fa8b297 --- /dev/null +++ b/patches/pkcs7.h.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | --- include/openssl/pkcs7.h.orig 2015-07-06 13:26:27.369203527 -0700 | ||
| 2 | +++ include/openssl/pkcs7.h 2015-07-06 13:27:37.637051967 -0700 | ||
| 3 | @@ -69,6 +69,16 @@ | ||
| 4 | extern "C" { | ||
| 5 | #endif | ||
| 6 | |||
| 7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | ||
| 8 | +#ifdef _MSC_VER | ||
| 9 | +#pragma message("Warning, overriding WinCrypt defines") | ||
| 10 | +#else | ||
| 11 | +#warning overriding WinCrypt defines | ||
| 12 | +#endif | ||
| 13 | +#undef PKCS7_ISSUER_AND_SERIAL | ||
| 14 | +#undef PKCS7_SIGNER_INFO | ||
| 15 | +#endif | ||
| 16 | + | ||
| 17 | /* | ||
| 18 | Encryption_ID DES-CBC | ||
| 19 | Digest_ID MD5 | ||
diff --git a/patches/x509.h.patch b/patches/x509.h.patch new file mode 100644 index 0000000..13686c1 --- /dev/null +++ b/patches/x509.h.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | --- include/openssl/x509.h.orig 2015-07-06 13:15:15.059306046 -0700 | ||
| 2 | +++ include/openssl/x509.h 2015-07-06 13:16:10.506118278 -0700 | ||
| 3 | @@ -112,6 +112,17 @@ | ||
| 4 | extern "C" { | ||
| 5 | #endif | ||
| 6 | |||
| 7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | ||
| 8 | +#ifdef _MSC_VER | ||
| 9 | +#pragma message("Warning, overriding WinCrypt defines") | ||
| 10 | +#else | ||
| 11 | +#warning overriding WinCrypt defines | ||
| 12 | +#endif | ||
| 13 | +#undef X509_NAME | ||
| 14 | +#undef X509_CERT_PAIR | ||
| 15 | +#undef X509_EXTENSIONS | ||
| 16 | +#endif | ||
| 17 | + | ||
| 18 | #define X509_FILETYPE_PEM 1 | ||
| 19 | #define X509_FILETYPE_ASN1 2 | ||
| 20 | #define X509_FILETYPE_DEFAULT 3 | ||