Nigel Rantor / azure_c_shared_utility

Fork of azure_c_shared_utility by Azure IoT

Files at this revision

API Documentation at this revision

Comitter:
AzureIoTClient
Date:
Fri Aug 11 14:03:20 2017 -0700
Parent:
30:ce3813c5a692
Child:
32:1a95b47c921a
Commit message:
1.1.21

Changed in this revision

connection_string_parser.c Show annotated file Show diff for this revision Revisions of this file
tlsio_wolfssl.c Show annotated file Show diff for this revision Revisions of this file
--- a/connection_string_parser.c	Fri Jul 14 16:38:40 2017 -0700
+++ b/connection_string_parser.c	Fri Aug 11 14:03:20 2017 -0700
@@ -25,12 +25,12 @@
     else
     {
         result = connectionstringparser_parse(connString);
+        STRING_delete(connString);
     }
 
     return result;
 }
 
-
 /* Codes_SRS_CONNECTIONSTRINGPARSER_01_001: [connectionstringparser_parse shall parse all key value pairs from the connection_string passed in as argument and return a new map that holds the key/value pairs.] */
 MAP_HANDLE connectionstringparser_parse(STRING_HANDLE connection_string)
 {
--- a/tlsio_wolfssl.c	Fri Jul 14 16:38:40 2017 -0700
+++ b/tlsio_wolfssl.c	Fri Aug 11 14:03:20 2017 -0700
@@ -420,7 +420,7 @@
     int result;
     if (tls_io_instance->certificate != NULL)
     {
-        int res = wolfSSL_CTX_load_verify_buffer(tls_io_instance->ssl_context, (const unsigned char*)tls_io_instance->certificate, strlen(tls_io_instance->certificate) + 1, SSL_FILETYPE_PEM);
+        int res = wolfSSL_CTX_load_verify_buffer(tls_io_instance->ssl_context, (const unsigned char*)tls_io_instance->certificate, strlen(tls_io_instance->certificate), SSL_FILETYPE_PEM);
         if (res != SSL_SUCCESS)
         {
             LogError("wolfSSL_CTX_load_verify_buffer failed");
@@ -442,12 +442,12 @@
 
     int result;
 
-    if (wolfSSL_use_certificate_buffer(ssl, (unsigned char*)x509certificate, strlen(x509certificate) + 1, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    if (wolfSSL_use_certificate_chain_buffer(ssl, (unsigned char*)x509certificate, strlen(x509certificate)) != SSL_SUCCESS)
     {
         LogError("unable to load x509 client certificate");
         result = __FAILURE__;
     }
-    else if (wolfSSL_use_PrivateKey_buffer(ssl, (unsigned char*)x509privatekey, strlen(x509privatekey) + 1, SSL_FILETYPE_PEM) != SSL_SUCCESS)
+    else if (wolfSSL_use_PrivateKey_buffer(ssl, (unsigned char*)x509privatekey, strlen(x509privatekey), SSL_FILETYPE_PEM) != SSL_SUCCESS)
     {
         LogError("unable to load x509 client private key");
         result = __FAILURE__;
@@ -530,7 +530,7 @@
 void tlsio_wolfssl_deinit(void)
 {
 }
-
+ 
 CONCRETE_IO_HANDLE tlsio_wolfssl_create(void* io_create_parameters)
 {
     TLS_IO_INSTANCE* result;