Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ssl structure management #1600

Merged
merged 3 commits into from
Feb 7, 2019

Conversation

mikee47
Copy link
Contributor

@mikee47 mikee47 commented Feb 6, 2019

Not tested on hardware; I don't have an SSL setup at the moment...

@slaff
Copy link
Contributor

slaff commented Feb 6, 2019

@mikee47 Don't forget to run make cs.

0.08s$ if [ "$SDK_VERSION" == "2.0.0" ]; then ../.travis/tools/clang/format-pr.sh; fi
clang-format version 6.0.1-svn334776-1~exp1~20190124082834.116 (branches/release_60)
!!! Sming/SmingCore/Network/TcpConnection.h not compliant to coding style, here is the fix:
--- Sming/SmingCore/Network/TcpConnection.h	2019-02-06 13:50:24.833828076 +0000
+++ /dev/fd/63	2019-02-06 13:50:32.769836421 +0000
@@ -58,7 +58,6 @@
 	}
 } SSLFingerprints;
 
-
 /** @brief Structure to manage an SSL key certificate with optional password
  *  @note Do not set member variables directly, use provided methods
  */
@@ -89,7 +88,7 @@
 	 *  @note We take a new copy of the certificate
 	 */
 	bool assign(const uint8_t* newKey, unsigned newKeyLength, const uint8_t* newCertificate,
-					unsigned newCertificateLength, const char* newKeyPassword = nullptr)
+				unsigned newCertificateLength, const char* newKeyPassword = nullptr)
 	{
 		free();
 
@@ -127,10 +126,11 @@
 	 */
 	bool assign(const SSLKeyCertPair& keyCert)
 	{
-		return assign(keyCert.key, keyCert.keyLength, keyCert.certificate, keyCert.certificateLength, keyCert.keyPassword);
+		return assign(keyCert.key, keyCert.keyLength, keyCert.certificate, keyCert.certificateLength,
+					  keyCert.keyPassword);
 	}
 
-	SSLKeyCertPair& operator = (const SSLKeyCertPair& keyCert)
+	SSLKeyCertPair& operator=(const SSLKeyCertPair& keyCert)
 	{
 		assign(keyCert);
 		return *this;
The command "if [ "$SDK_VERSION" == "2.0.0" ]; then ../.travis/tools/clang/format-pr.sh; fi" exited with 1.

@slaff slaff added this to the 3.7.2 milestone Feb 6, 2019
@slaff slaff removed the 3 - Review label Feb 7, 2019
@slaff slaff merged commit c082b08 into SmingHub:develop Feb 7, 2019
@mikee47 mikee47 deleted the fix/SSL_structure_management branch February 7, 2019 11:36
@slaff slaff mentioned this pull request Feb 27, 2019
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants