mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'feature/openssl' into 'master' 

examples/10_openssl_server: fixup SSL server with method of specific version

1. add method of any version supporting at OpenSSL and add API in header file
2. change OpenSSL server context method to be method of any version

Fixes http://esp32.com/viewtopic.php?f=14&t=696.

See merge request !369
pull/249/head
Wu Jian Gang 2017-01-10 12:01:40 +08:00
rodzic f89de9c5af 8c7dfef317
commit fb70126bc8
6 zmienionych plików z 41 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
components/openssl/include/openssl/ssl.h 100644 → 100755
Wyświetl plik

@ -214,6 +214,14 @@ const SSL_METHOD* TLSv1_1_client_method(void);
*/
const SSL_METHOD* TLSv1_2_client_method(void);
/**
* @brief create the target SSL context server method
*
* @param none
*
* @return the TLS any version SSL context client method
*/
const SSL_METHOD* TLS_client_method(void);
/**
* @brief create the target SSL context server method
@ -260,6 +268,16 @@ const SSL_METHOD* TLSv1_server_method(void);
*/
const SSL_METHOD* SSLv3_server_method(void);
/**
* @brief create the target SSL context server method
*
* @param none
*
* @return the TLS any version SSL context server method
*/
const SSL_METHOD* TLS_server_method(void);
/**
* @brief set the SSL context ALPN select callback function
*

3
components/openssl/platform/ssl_pm.c 100644 → 100755
Wyświetl plik

@ -125,6 +125,9 @@ int ssl_pm_new(SSL *ssl)
mbedtls_ssl_conf_max_version(&ssl_pm->conf, MBEDTLS_SSL_MAJOR_VERSION_3, version);
mbedtls_ssl_conf_min_version(&ssl_pm->conf, MBEDTLS_SSL_MAJOR_VERSION_3, version);
} else {
mbedtls_ssl_conf_max_version(&ssl_pm->conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_3);
mbedtls_ssl_conf_min_version(&ssl_pm->conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_0);
}
mbedtls_ssl_conf_rng(&ssl_pm->conf, mbedtls_ctr_drbg_random, &ssl_pm->ctr_drbg);

2
examples/10_openssl_server/README.md 100644 → 100755
Wyświetl plik

@ -5,7 +5,7 @@ The Example contains of OpenSSL server demo.
First you should configure the project by "make menuconfig":
Example Configuration ->
1. WIFI SSID: WIFI network to which your PC is also connected to.
1. WIFI Password: WIFI password
2. WIFI Password: WIFI password
IF you want to test the OpenSSL server demo:
1. compile the code and load the firmware

2
examples/10_openssl_server/main/Kconfig.projbuild 100644 → 100755
Wyświetl plik

@ -12,4 +12,4 @@ config WIFI_PASSWORD
help
WiFi password (WPA or WPA2) for the example to use.
endmenu
endmenu

20
examples/10_openssl_server/main/openssl_server.c 100644 → 100755
Wyświetl plik

@ -43,7 +43,8 @@ const static char *TAG = "Openssl_demo";
"<title>OpenSSL demo</title></head><body>\r\n" \
"OpenSSL server demo!\r\n" \
"</body>\r\n" \
"</html>\r\n"
"</html>\r\n" \
"\r\n"
static void openssl_demo_thread(void *p)
{
@ -70,7 +71,7 @@ static void openssl_demo_thread(void *p)
const unsigned int prvtkey_pem_bytes = prvtkey_pem_end - prvtkey_pem_start;
ESP_LOGI(TAG, "SSL server context create ......");
ctx = SSL_CTX_new(SSLv3_server_method());
ctx = SSL_CTX_new(TLS_server_method());
if (!ctx) {
ESP_LOGI(TAG, "failed");
goto failed1;
@ -155,14 +156,21 @@ reconnect:
if (ret <= 0) {
break;
}
if (strstr(recv_buf, "GET / HTTP/1.1")) {
SSL_write(ssl, send_data, send_bytes);
ESP_LOGI(TAG, "SSL read: %s", recv_buf);
if (strstr(recv_buf, "GET ") &&
strstr(recv_buf, " HTTP/1.1")) {
ESP_LOGI(TAG, "SSL get matched message")
ESP_LOGI(TAG, "SSL write message")
ret = SSL_write(ssl, send_data, send_bytes);
if (ret > 0) {
ESP_LOGI(TAG, "OK")
} else {
ESP_LOGI(TAG, "error")
}
break;
}
} while (1);
ESP_LOGI(TAG, "result %d", ret);
SSL_shutdown(ssl);
failed5:
close(new_socket);

6
examples/10_openssl_server/main/openssl_server.h 100644 → 100755
Wyświetl plik

@ -7,8 +7,10 @@
CONDITIONS OF ANY KIND, either express or implied.
*/
#ifndef _OPENSSL_DEMO_H_
#define _OPENSSL_DEMO_H_
#ifndef _OPENSSL_SERVER_H_
#define _OPENSSL_SERVER_H_
#include "sdkconfig.h"
/* The examples use simple WiFi configuration that you can set via
'make menuconfig'.