aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/modes
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2014-10-18 19:59:47 -0400
committerMike DePaulo <mikedep333@gmail.com>2014-10-18 20:57:54 -0400
commitc4962abc9b5940cdd3bed920b19334fd269df31b (patch)
tree59c80b695ba170e37a9be4edfc2770e7b50ebea1 /openssl/crypto/modes
parentc70e12e95b569baa2274eacfbac43dd2df40c2ae (diff)
downloadvcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.gz
vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.tar.bz2
vcxsrv-c4962abc9b5940cdd3bed920b19334fd269df31b.zip
Update openssl to version openssl-1.0.1j
Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/modes')
-rw-r--r--openssl/crypto/modes/modes.h6
1 files changed, 6 insertions, 0 deletions
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