mchapman/nina-fw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

malloc and fail certificate

Browse Source
This commit is contained in:
brentru
2019-10-03 12:13:43 -04:00
parent a7efa04365
commit ab949fe922
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arduino/libraries/WiFi/src/WiFiSSLClient.cpp
View File

@@ -54,6 +54,7 @@ WiFiSSLClient::WiFiSSLClient() :
int WiFiSSLClient::connect(const char* host, uint16_t port) int WiFiSSLClient::connect(const char* host, uint16_t port)
{ {
ets_printf("** Connect Called");
// Hardcode CERT // Hardcode CERT
const char AWS_CERT_CRT[] = "-----BEGIN CERTIFICATE-----\n" \ const char AWS_CERT_CRT[] = "-----BEGIN CERTIFICATE-----\n" \
"MIIDWTCCAkGgAwIBAgIUHi7YIHwvdKnUKTKE4MzqaVvVW7QwDQYJKoZIhvcNAQEL\n" \ "MIIDWTCCAkGgAwIBAgIUHi7YIHwvdKnUKTKE4MzqaVvVW7QwDQYJKoZIhvcNAQEL\n" \

28
main/CommandHandler.cpp
View File

@@ -1051,23 +1051,27 @@ int wpa2EntEnable(const uint8_t command[], uint8_t response[]) {
int setClientCert(const uint8_t command[], uint8_t response[]){ int setClientCert(const uint8_t command[], uint8_t response[]){
ets_printf("*** Called setClientCert\n"); ets_printf("*** Called setClientCert\n");
size_t cert_sz = (command[3] << 8) & 0xff; // certificate length
ets_printf("*** Cert Size: %d\n", cert_sz);
//char* cert = (char*) malloc(cert_sz + 1);
// manually allocate for now
char cert[1225 * 4];
memset(cert, 0x00, sizeof(cert)); size_t ca_cert_buf_size = (command[3] << 8 | command[4]);
memcpy(cert, &command[4], command[3]); char* ca_cert_buf = (char*)malloc(ca_cert_buf_size+1);
if (!ca_cert_buf) {
ets_printf("Certificate allocation failed!\n");
return -1;
}
// TODO: Remove the following, switch to MAX_SOCKETS impl. ets_printf("\nCert Sz: %d\n", ca_cert_buf_size);
// for testing, we'll only be using memset(ca_cert_buf, 0x00, ca_cert_buf_size+1);
tlsClients[0].setCertificate(cert); memcpy(ca_cert_buf, &command[4], ca_cert_buf_size);
ets_printf("\nCert: \n %s", ca_cert_buf);
// todo: remove in favor of max_sockets impl. below
tlsClients[0].setCertificate(ca_cert_buf);
/* /*
// don't know the socket slot, try up to MAX_SOCKETS // we're not sure which socket will be allocated in
// connect, so setCertificate for MAX_SOCKETS
for (int socket=0; socket<MAX_SOCKETS; socket++){ for (int socket=0; socket<MAX_SOCKETS; socket++){
tlsClients[socket].setCertificate(cert); tlsClients[socket].setCertificate(ca_cert_buf);
} }
*/ */