From c4962abc9b5940cdd3bed920b19334fd269df31b Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 18 Oct 2014 19:59:47 -0400
Subject: Update openssl to version openssl-1.0.1j

Conflicts:
	openssl/Makefile
	openssl/crypto/opensslconf.h
---
 openssl/crypto/modes/modes.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'openssl/crypto/modes')

diff --git a/openssl/crypto/modes/modes.h b/openssl/crypto/modes/modes.h
index f18215bb2..7773c2542 100644
--- a/openssl/crypto/modes/modes.h
+++ b/openssl/crypto/modes/modes.h
@@ -7,6 +7,9 @@
 
 #include <stddef.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 typedef void (*block128_f)(const unsigned char in[16],
 			unsigned char out[16],
 			const void *key);
@@ -133,3 +136,6 @@ typedef struct xts128_context XTS128_CONTEXT;
 
 int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16],
 	const unsigned char *inp, unsigned char *out, size_t len, int enc);
+#ifdef  __cplusplus
+}
+#endif
-- 
cgit v1.2.3