From 83aea6c833c399757d3c740bcd23b0f6ba912859 Mon Sep 17 00:00:00 2001
From: dongheng <dongheng@espressif.com>
Date: Fri, 23 Sep 2016 15:18:14 +0800
Subject: [PATCH] components/openssl: add extern C symbol

---
 components/openssl/include/internal/ssl3.h        | 8 ++++++++
 components/openssl/include/internal/ssl_cert.h    | 8 ++++++++
 components/openssl/include/internal/ssl_code.h    | 8 ++++++++
 components/openssl/include/internal/ssl_dbg.h     | 8 ++++++++
 components/openssl/include/internal/ssl_lib.h     | 8 ++++++++
 components/openssl/include/internal/ssl_methods.h | 8 ++++++++
 components/openssl/include/internal/ssl_pkey.h    | 8 ++++++++
 components/openssl/include/internal/ssl_stack.h   | 8 ++++++++
 components/openssl/include/internal/ssl_types.h   | 8 ++++++++
 components/openssl/include/internal/ssl_x509.h    | 8 ++++++++
 components/openssl/include/internal/tls1.h        | 8 ++++++++
 components/openssl/include/internal/x509_vfy.h    | 8 ++++++++
 components/openssl/include/openssl/ssl.h          | 7 +++++++
 components/openssl/include/platform/ssl_pm.h      | 4 ++++
 components/openssl/include/platform/ssl_port.h    | 4 ++++
 15 files changed, 111 insertions(+)

diff --git a/components/openssl/include/internal/ssl3.h b/components/openssl/include/internal/ssl3.h
index c90d546df..007b392f3 100644
--- a/components/openssl/include/internal/ssl3.h
+++ b/components/openssl/include/internal/ssl3.h
@@ -15,6 +15,10 @@
 #ifndef _SSL3_H_
 #define _SSL3_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 # define SSL3_AD_CLOSE_NOTIFY             0
 # define SSL3_AD_UNEXPECTED_MESSAGE      10/* fatal */
 # define SSL3_AD_BAD_RECORD_MAC          20/* fatal */
@@ -33,4 +37,8 @@
 
 #define SSL3_VERSION                 0x0300
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_cert.h b/components/openssl/include/internal/ssl_cert.h
index b0bd09d48..6441aaf52 100644
--- a/components/openssl/include/internal/ssl_cert.h
+++ b/components/openssl/include/internal/ssl_cert.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_CERT_H_
 #define _SSL_CERT_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 
 /**
@@ -35,4 +39,8 @@ CERT* ssl_cert_new(void);
  */
 void ssl_cert_free(CERT *cert);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_code.h b/components/openssl/include/internal/ssl_code.h
index 34107d432..80fdbb20f 100644
--- a/components/openssl/include/internal/ssl_code.h
+++ b/components/openssl/include/internal/ssl_code.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_CODE_H_
 #define _SSL_CODE_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl3.h"
 #include "tls1.h"
 #include "x509_vfy.h"
@@ -113,4 +117,8 @@ typedef enum {
     TLS_ST_SW_FINISHED
 } OSSL_HANDSHAKE_STATE;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_dbg.h b/components/openssl/include/internal/ssl_dbg.h
index 745de536f..27a4bc4db 100644
--- a/components/openssl/include/internal/ssl_dbg.h
+++ b/components/openssl/include/internal/ssl_dbg.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_DEBUG_H_
 #define _SSL_DEBUG_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #define SSL_DEBUG_ENBALE 0
 #define SSL_DEBUG_LEVEL 0
 #define SSL_ASSERT_ENABLE 0
@@ -46,4 +50,8 @@
 
 #define SSL_DEBUG(level, ...) { if (level > SSL_DEBUG_LEVEL) {SSL_PRINT(__VA_ARGS__);} }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_lib.h b/components/openssl/include/internal/ssl_lib.h
index 6ea547a7c..bf7de22fd 100644
--- a/components/openssl/include/internal/ssl_lib.h
+++ b/components/openssl/include/internal/ssl_lib.h
@@ -15,6 +15,14 @@
 #ifndef _SSL_LIB_H_
 #define _SSL_LIB_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_methods.h b/components/openssl/include/internal/ssl_methods.h
index 68737b438..a20b7c768 100644
--- a/components/openssl/include/internal/ssl_methods.h
+++ b/components/openssl/include/internal/ssl_methods.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_METHODS_H_
 #define _SSL_METHODS_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 /**
  * TLS method function implement
  */
@@ -110,4 +114,8 @@ const X509_METHOD* X509_method(void);
  */
 const PKEY_METHOD* EVP_PKEY_method(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_pkey.h b/components/openssl/include/internal/ssl_pkey.h
index d9a22ee02..5b7f341de 100644
--- a/components/openssl/include/internal/ssl_pkey.h
+++ b/components/openssl/include/internal/ssl_pkey.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_PKEY_H_
 #define _SSL_PKEY_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 
 /**
@@ -51,4 +55,8 @@ EVP_PKEY* d2i_PrivateKey(int type,
  */
 void EVP_PKEY_free(EVP_PKEY *x);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_stack.h b/components/openssl/include/internal/ssl_stack.h
index b97015bd9..b37c8dffa 100644
--- a/components/openssl/include/internal/ssl_stack.h
+++ b/components/openssl/include/internal/ssl_stack.h
@@ -1,6 +1,10 @@
 #ifndef _SSL_STACK_H_
 #define _SSL_STACK_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 
 /**
@@ -30,4 +34,8 @@ OPENSSL_STACK *OPENSSL_sk_new_null(void);
  */
 void OPENSSL_sk_free(OPENSSL_STACK *stack);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_types.h b/components/openssl/include/internal/ssl_types.h
index 6da607614..1dc31f5a5 100644
--- a/components/openssl/include/internal/ssl_types.h
+++ b/components/openssl/include/internal/ssl_types.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_TYPES_H_
 #define _SSL_TYPES_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_code.h"
 
 typedef void SSL_CIPHER;
@@ -294,4 +298,8 @@ typedef int (*next_proto_cb)(SSL *ssl, unsigned char **out,
                              unsigned char *outlen, const unsigned char *in,
                              unsigned int inlen, void *arg);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/ssl_x509.h b/components/openssl/include/internal/ssl_x509.h
index 9359073b6..5dac46137 100644
--- a/components/openssl/include/internal/ssl_x509.h
+++ b/components/openssl/include/internal/ssl_x509.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_X509_H_
 #define _SSL_X509_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 #include "ssl_stack.h"
 
@@ -50,4 +54,8 @@ X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len);
  */
 void X509_free(X509 *x);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/tls1.h b/components/openssl/include/internal/tls1.h
index b2da63919..a9da53e06 100644
--- a/components/openssl/include/internal/tls1.h
+++ b/components/openssl/include/internal/tls1.h
@@ -15,6 +15,10 @@
 #ifndef _TLS1_H_
 #define _TLS1_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 # define TLS1_AD_DECRYPTION_FAILED       21
 # define TLS1_AD_RECORD_OVERFLOW         22
 # define TLS1_AD_UNKNOWN_CA              48/* fatal */
@@ -44,4 +48,8 @@
 #define TLS1_1_VERSION                  0x0302
 #define TLS1_2_VERSION                  0x0303
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/internal/x509_vfy.h b/components/openssl/include/internal/x509_vfy.h
index cab110e42..d5b0d1a21 100644
--- a/components/openssl/include/internal/x509_vfy.h
+++ b/components/openssl/include/internal/x509_vfy.h
@@ -15,6 +15,10 @@
 #ifndef _X509_VFY_H_
 #define _X509_VFY_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #define         X509_V_OK                                       0
 #define         X509_V_ERR_UNSPECIFIED                          1
 #define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
@@ -100,4 +104,8 @@
 
 #define         X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION         72
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/openssl/include/openssl/ssl.h b/components/openssl/include/openssl/ssl.h
index 3f92a68d7..3e8e88e67 100644
--- a/components/openssl/include/openssl/ssl.h
+++ b/components/openssl/include/openssl/ssl.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_H_
 #define _SSL_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "platform/ssl_port.h"
 #include "internal/ssl_x509.h"
 
@@ -1684,5 +1688,8 @@ const char *SSL_get_psk_identity_hint(SSL *ssl);
  */
 const char *SSL_get_psk_identity(SSL *ssl);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
diff --git a/components/openssl/include/platform/ssl_pm.h b/components/openssl/include/platform/ssl_pm.h
index 3f64a4ae3..47a7331b7 100644
--- a/components/openssl/include/platform/ssl_pm.h
+++ b/components/openssl/include/platform/ssl_pm.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_PM_H_
 #define _SSL_PM_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "ssl_types.h"
 #include "ssl_port.h"
 
diff --git a/components/openssl/include/platform/ssl_port.h b/components/openssl/include/platform/ssl_port.h
index 23ef5a875..995d33e0e 100644
--- a/components/openssl/include/platform/ssl_port.h
+++ b/components/openssl/include/platform/ssl_port.h
@@ -15,6 +15,10 @@
 #ifndef _SSL_PORT_H_
 #define _SSL_PORT_H_
 
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
 #include "esp_types.h"
 
 void* ssl_zalloc(size_t size);