Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ

3 files changed, 9 insertions, 3 deletions

diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
index ccc1ad24b39..5603430a677 100644
--- a/extra/yassl/src/ssl.cpp
+++ b/extra/yassl/src/ssl.cpp
@@ -1493,7 +1493,8 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
 
 void ERR_remove_state(unsigned long)
 {
-    GetErrors().Remove();
+    if (HasErrors())
+       GetErrors().Remove();
 }
 
 
diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp
index fec6a3394ca..f339655be3d 100644
--- a/extra/yassl/src/yassl_error.cpp
+++ b/extra/yassl/src/yassl_error.cpp
@@ -121,11 +121,11 @@ void SetErrorString(YasslError error, char* buffer)
         break; 
 
     case certificate_error :
-        strncpy(buffer, "unable to proccess cerificate", max);
+        strncpy(buffer, "unable to process cerificate", max);
         break;
 
     case privateKey_error :
-        strncpy(buffer, "unable to proccess private key, bad format", max);
+        strncpy(buffer, "unable to process private key, bad format", max);
         break;
 
     case badVersion_error :
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index a38b7a5c81f..9b447547c56 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -1688,6 +1688,11 @@ Errors& GetErrors()
     return *errorsInstance;
 }
 
+bool HasErrors()
+{
+  return (errorsInstance != 0);
+}
+
 
 typedef Mutex::Lock Lock;