Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit dedc3c4

Browse files
author
Me No Dev
committed
stop some more debug and add test server cert+key
1 parent df44ce9 commit dedc3c4

File tree

7 files changed

+45
-150
lines changed

7 files changed

+45
-150
lines changed

src/ESPAsyncTCP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void AsyncClient::_ssl_error(int8_t err){
343343

344344
int8_t AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
345345
_rx_last_packet = millis();
346-
ets_printf("ack: %u\n", len);
346+
//ets_printf("ack: %u\n", len);
347347
_pcb_busy = false;
348348
if(_sent_cb)
349349
_sent_cb(_sent_cb_arg, this, len, (millis() - _pcb_sent_at));
@@ -354,7 +354,7 @@ int8_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, int8_t err) {
354354
if(pb == 0){
355355
//ets_printf("_pb null! %d\n", err);
356356
return _close();
357-
} else ets_printf("_recv: %d\n", pb->tot_len);
357+
} //else ets_printf("_recv: %d\n", pb->tot_len);
358358

359359
_rx_last_packet = millis();
360360
if(_pcb_secure){

src/include/ssl_config.h

Lines changed: 0 additions & 140 deletions
This file was deleted.

src/tcp_axtls.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ tcp_ssl_t * tcp_ssl_new(struct tcp_pcb *tcp) {
124124
item->next = new_item;
125125
}
126126

127-
TCP_SSL_DEBUG("tcp_ssl_new: %d\n", new_item->fd);
127+
//TCP_SSL_DEBUG("tcp_ssl_new: %d\n", new_item->fd);
128128
return new_item;
129129
}
130130

@@ -223,7 +223,7 @@ int tcp_ssl_free(struct tcp_pcb *tcp) {
223223
if(item->tcp_pbuf != NULL){
224224
pbuf_free(item->tcp_pbuf);
225225
}
226-
TCP_SSL_DEBUG("tcp_ssl_free: %d\n", item->fd);
226+
//TCP_SSL_DEBUG("tcp_ssl_free: %d\n", item->fd);
227227
if(item->ssl)
228228
ssl_free(item->ssl);
229229
if(item->type == TCP_SSL_TYPE_CLIENT && item->ssl_ctx)
@@ -244,7 +244,7 @@ int tcp_ssl_free(struct tcp_pcb *tcp) {
244244
if(i->tcp_pbuf != NULL){
245245
pbuf_free(i->tcp_pbuf);
246246
}
247-
TCP_SSL_DEBUG("tcp_ssl_free: %d\n", i->fd);
247+
//TCP_SSL_DEBUG("tcp_ssl_free: %d\n", i->fd);
248248
if(i->ssl)
249249
ssl_free(i->ssl);
250250
if(i->type == TCP_SSL_TYPE_CLIENT && i->ssl_ctx)
@@ -274,7 +274,7 @@ int tcp_ssl_write(struct tcp_pcb *tcp, uint8_t *data, size_t len) {
274274
return rc;
275275
}
276276

277-
TCP_SSL_DEBUG("tcp_ssl_write: %u -> %d\r\n", len, axl->last_wr);
277+
//TCP_SSL_DEBUG("tcp_ssl_write: %u -> %d\r\n", len, axl->last_wr);
278278

279279
return axl->last_wr;
280280
}
@@ -333,7 +333,7 @@ int tcp_ssl_read(struct tcp_pcb *tcp, struct pbuf *p) {
333333
if(fd_data->handshake != SSL_OK) {
334334
fd_data->handshake = ssl_handshake_status(fd_data->ssl);
335335
if(fd_data->handshake == SSL_OK){
336-
TCP_SSL_DEBUG("tcp_ssl_read: handshake OK\n");
336+
//TCP_SSL_DEBUG("tcp_ssl_read: handshake OK\n");
337337
if(fd_data->on_handshake)
338338
fd_data->on_handshake(fd_data->arg, fd_data->tcp, fd_data->ssl);
339339
} else if(fd_data->handshake != SSL_NOT_OK){
@@ -470,7 +470,7 @@ int ax_port_write(int fd, uint8_t *data, uint16_t len) {
470470

471471

472472
if (err == ERR_OK) {
473-
TCP_SSL_DEBUG("ax_port_write: tcp_output length %d / %d\n", tcp_len, len);
473+
//TCP_SSL_DEBUG("ax_port_write: tcp_output length %d / %d\n", tcp_len, len);
474474
err = tcp_output(fd_data->tcp);
475475
if(err != ERR_OK) {
476476
TCP_SSL_DEBUG("ax_port_write: tcp_output err: %d\n", err);
@@ -492,7 +492,7 @@ int ax_port_read(int fd, uint8_t *data, int len) {
492492
uint8_t *pread_buf = NULL;
493493
u16_t recv_len = 0;
494494

495-
TCP_SSL_DEBUG("ax_port_read: %d, %d\n", fd, len);
495+
//TCP_SSL_DEBUG("ax_port_read: %d, %d\n", fd, len);
496496

497497
fd_data = tcp_ssl_get_by_fd(fd);
498498
if (fd_data == NULL) {

src/tcp_axtls.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ extern "C" {
3737
#endif
3838

3939
#include "include/ssl.h"
40-
#include "include/ssl_config.h"
4140

4241
#define ERR_TCP_SSL_INVALID_SSL -101
4342
#define ERR_TCP_SSL_INVALID_TCP -102

ssl/gen_server_cert.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
cat > ca_cert.conf << EOF
4+
[ req ]
5+
distinguished_name = req_distinguished_name
6+
prompt = no
7+
8+
[ req_distinguished_name ]
9+
O = Espressif Systems
10+
EOF
11+
12+
openssl genrsa -out axTLS.ca_key.pem 2048
13+
openssl req -new -config ./ca_cert.conf -key axTLS.ca_key.pem -out axTLS.ca_x509.req
14+
openssl x509 -req -sha1 -days 5000 -signkey axTLS.ca_key.pem -CAkey axTLS.ca_key.pem -in axTLS.ca_x509.req -out axTLS.ca_x509.pem
15+
16+
cat > certs.conf << EOF
17+
[ req ]
18+
distinguished_name = req_distinguished_name
19+
prompt = no
20+
21+
[ req_distinguished_name ]
22+
O = axTLS on ESP8266
23+
CN = esp8266.local
24+
EOF
25+
26+
openssl genrsa -out axTLS.key_1024.pem 1024
27+
openssl req -new -config ./certs.conf -key axTLS.key_1024.pem -out axTLS.x509_1024.req
28+
openssl x509 -req -sha1 -CAcreateserial -days 5000 -CA axTLS.ca_x509.pem -CAkey axTLS.ca_key.pem -in axTLS.x509_1024.req -out axTLS.x509_1024.pem
29+
30+
openssl rsa -outform DER -in axTLS.key_1024.pem -out axTLS.key_1024
31+
openssl x509 -outform DER -in axTLS.x509_1024.pem -out axTLS.x509_1024.cer
32+
33+
cat axTLS.key_1024 > server.key
34+
cat axTLS.x509_1024.cer > server.cer
35+
36+
rm axTLS.* ca_cert.conf certs.conf

ssl/server.cer

587 Bytes
Binary file not shown.

ssl/server.key

611 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)