diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-12-07 08:03:44 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-12-07 08:03:44 -0600 |
| commit | 19f58fdb1bf8052c0ea3ddd3230df07baaa4e843 (patch) | |
| tree | b9526d578b0dc1fcccbe7a197d25dc9e82958d27 | |
| parent | 1988b8f65e4bfa2c9fb1fa13316f3c22ec59d298 (diff) | |
| download | portable-19f58fdb1bf8052c0ea3ddd3230df07baaa4e843.tar.gz portable-19f58fdb1bf8052c0ea3ddd3230df07baaa4e843.tar.bz2 portable-19f58fdb1bf8052c0ea3ddd3230df07baaa4e843.zip | |
rebase windows headers patch
| -rw-r--r-- | patches/windows_headers.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index f6b799c..a8c8ab0 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | diff -urN include/openssl.orig/dtls1.h include/openssl/dtls1.h | 1 | diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h |
| 2 | --- include/openssl.orig/dtls1.h Mon Sep 21 21:45:45 2015 | 2 | --- include/openssl.orig/dtls1.h Mon Dec 7 07:58:32 2015 |
| 3 | +++ include/openssl/dtls1.h Mon Sep 21 21:58:56 2015 | 3 | +++ include/openssl/dtls1.h Mon Dec 7 07:56:14 2015 |
| 4 | @@ -60,7 +60,11 @@ | 4 | @@ -60,7 +60,11 @@ |
| 5 | #ifndef HEADER_DTLS1_H | 5 | #ifndef HEADER_DTLS1_H |
| 6 | #define HEADER_DTLS1_H | 6 | #define HEADER_DTLS1_H |
| @@ -13,9 +13,9 @@ diff -urN include/openssl.orig/dtls1.h include/openssl/dtls1.h | |||
| 13 | 13 | ||
| 14 | #include <stdio.h> | 14 | #include <stdio.h> |
| 15 | #include <stdlib.h> | 15 | #include <stdlib.h> |
| 16 | diff -urN include/openssl.orig/opensslconf.h include/openssl/opensslconf.h | 16 | diff -u include/openssl.orig/opensslconf.h include/openssl/opensslconf.h |
| 17 | --- include/openssl.orig/opensslconf.h Mon Sep 21 21:45:45 2015 | 17 | --- include/openssl.orig/opensslconf.h Mon Dec 7 07:58:32 2015 |
| 18 | +++ include/openssl/opensslconf.h Mon Sep 21 21:56:13 2015 | 18 | +++ include/openssl/opensslconf.h Mon Dec 7 07:56:14 2015 |
| 19 | @@ -1,6 +1,10 @@ | 19 | @@ -1,6 +1,10 @@ |
| 20 | #include <openssl/opensslfeatures.h> | 20 | #include <openssl/opensslfeatures.h> |
| 21 | /* crypto/opensslconf.h.in */ | 21 | /* crypto/opensslconf.h.in */ |
| @@ -27,10 +27,10 @@ diff -urN include/openssl.orig/opensslconf.h include/openssl/opensslconf.h | |||
| 27 | /* Generate 80386 code? */ | 27 | /* Generate 80386 code? */ |
| 28 | #undef I386_ONLY | 28 | #undef I386_ONLY |
| 29 | 29 | ||
| 30 | diff -urN include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h | 30 | diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h |
| 31 | --- include/openssl.orig/ossl_typ.h Mon Sep 21 21:45:45 2015 | 31 | --- include/openssl.orig/ossl_typ.h Mon Dec 7 07:58:32 2015 |
| 32 | +++ include/openssl/ossl_typ.h Mon Sep 21 21:56:22 2015 | 32 | +++ include/openssl/ossl_typ.h Mon Dec 7 07:56:14 2015 |
| 33 | @@ -100,6 +100,22 @@ | 33 | @@ -80,6 +80,22 @@ |
| 34 | typedef struct ASN1_ITEM_st ASN1_ITEM; | 34 | typedef struct ASN1_ITEM_st ASN1_ITEM; |
| 35 | typedef struct asn1_pctx_st ASN1_PCTX; | 35 | typedef struct asn1_pctx_st ASN1_PCTX; |
| 36 | 36 | ||
| @@ -53,9 +53,9 @@ diff -urN include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h | |||
| 53 | #ifdef BIGNUM | 53 | #ifdef BIGNUM |
| 54 | #undef BIGNUM | 54 | #undef BIGNUM |
| 55 | #endif | 55 | #endif |
| 56 | diff -urN include/openssl.orig/pkcs7.h include/openssl/pkcs7.h | 56 | diff -u include/openssl.orig/pkcs7.h include/openssl/pkcs7.h |
| 57 | --- include/openssl.orig/pkcs7.h Mon Sep 21 21:45:45 2015 | 57 | --- include/openssl.orig/pkcs7.h Mon Dec 7 07:58:32 2015 |
| 58 | +++ include/openssl/pkcs7.h Mon Sep 21 21:56:29 2015 | 58 | +++ include/openssl/pkcs7.h Mon Dec 7 07:56:14 2015 |
| 59 | @@ -69,6 +69,18 @@ | 59 | @@ -69,6 +69,18 @@ |
| 60 | extern "C" { | 60 | extern "C" { |
| 61 | #endif | 61 | #endif |
| @@ -75,9 +75,9 @@ diff -urN include/openssl.orig/pkcs7.h include/openssl/pkcs7.h | |||
| 75 | /* | 75 | /* |
| 76 | Encryption_ID DES-CBC | 76 | Encryption_ID DES-CBC |
| 77 | Digest_ID MD5 | 77 | Digest_ID MD5 |
| 78 | diff -urN include/openssl.orig/x509.h include/openssl/x509.h | 78 | diff -u include/openssl.orig/x509.h include/openssl/x509.h |
| 79 | --- include/openssl.orig/x509.h Mon Sep 21 21:45:45 2015 | 79 | --- include/openssl.orig/x509.h Mon Dec 7 07:58:32 2015 |
| 80 | +++ include/openssl/x509.h Mon Sep 21 21:56:35 2015 | 80 | +++ include/openssl/x509.h Mon Dec 7 07:56:14 2015 |
| 81 | @@ -112,6 +112,19 @@ | 81 | @@ -112,6 +112,19 @@ |
| 82 | extern "C" { | 82 | extern "C" { |
| 83 | #endif | 83 | #endif |