diff options
author | Brent Cook <bcook@openbsd.org> | 2015-06-19 02:09:27 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-06-19 02:09:27 -0500 |
commit | b67c9460bafb71e8f294c6469c15ccd20e65c4c4 (patch) | |
tree | bf2b7dc4942ede822694f5a75b253ed899616287 | |
parent | 976445393772c47b8ccef5a176ae781dab7d7e03 (diff) | |
download | portable-b67c9460bafb71e8f294c6469c15ccd20e65c4c4.tar.gz portable-b67c9460bafb71e8f294c6469c15ccd20e65c4c4.tar.bz2 portable-b67c9460bafb71e8f294c6469c15ccd20e65c4c4.zip |
remove unneeded local tls.h patch
-rw-r--r-- | patches/tls.h.patch | 25 | ||||
-rwxr-xr-x | update.sh | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/patches/tls.h.patch b/patches/tls.h.patch deleted file mode 100644 index e537132..0000000 --- a/patches/tls.h.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | --- include/tls.h.orig 2015-05-23 19:18:30.002576267 -0500 | ||
2 | +++ include/tls.h 2015-05-23 19:18:09.830576581 -0500 | ||
3 | @@ -18,6 +18,13 @@ | ||
4 | #ifndef HEADER_TLS_H | ||
5 | #define HEADER_TLS_H | ||
6 | |||
7 | +#ifdef __cplusplus | ||
8 | +extern "C" { | ||
9 | +#endif | ||
10 | + | ||
11 | +#include <stddef.h> | ||
12 | +#include <stdint.h> | ||
13 | + | ||
14 | #define TLS_API 20141031 | ||
15 | |||
16 | #define TLS_PROTOCOL_TLSv1_0 (1 << 1) | ||
17 | @@ -88,4 +95,8 @@ | ||
18 | |||
19 | uint8_t *tls_load_file(const char *_file, size_t *_len, char *_password); | ||
20 | |||
21 | +#ifdef __cplusplus | ||
22 | +} | ||
23 | +#endif | ||
24 | + | ||
25 | #endif /* HEADER_TLS_H */ | ||
@@ -63,9 +63,8 @@ $CP $libssl_src/src/crypto/opensslfeatures.h include/openssl | |||
63 | $CP $libssl_src/src/e_os2.h include/openssl | 63 | $CP $libssl_src/src/e_os2.h include/openssl |
64 | $CP $libssl_src/src/ssl/pqueue.h include | 64 | $CP $libssl_src/src/ssl/pqueue.h include |
65 | 65 | ||
66 | $CP $libtls_src/tls.h include/tls.h | 66 | $CP $libtls_src/tls.h include |
67 | patch -p0 < patches/tls.h.patch | 67 | $CP $libtls_src/tls.h libtls-standalone/include |
68 | $CP include/tls.h libtls-standalone/include | ||
69 | 68 | ||
70 | for i in crypto/compat libtls-standalone/compat; do | 69 | for i in crypto/compat libtls-standalone/compat; do |
71 | $CP $libc_src/crypt/arc4random.c \ | 70 | $CP $libc_src/crypt/arc4random.c \ |