aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/modes/modes.h
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:02 -0400
commit8aa7b05b29941b07940857ff6f60bcc60eaa59a9 (patch)
treeacf3d988cfbd1977723f93285bda5152d096b92e /openssl/crypto/modes/modes.h
parentd2d01e39531d9fb823b2271244c324aad0a6575d (diff)
downloadvcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.gz
vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.bz2
vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.zip
Update openssl to version openssl-1.0.1j
Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/modes/modes.h')
-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