Refactored SSL_clear_error()

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/crypto.c b/crypto.c
index 409c298b9eb73fc42b2442259f61761b9996f979..bdb3b1dee65b1da11399bd9fb86e1403ca6af3b8 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -191,8 +191,8 @@ openvpn_encrypt (struct buffer *buf, struct buffer work,
   gc_free (&gc);
   return;
 
- err:
-  ERR_clear_error ();
+err:
+  crypto_clear_error();
   buf->len = 0;
   gc_free (&gc);
   return;
@@ -363,7 +363,7 @@ openvpn_decrypt (struct buffer *buf, struct buffer work,
   return true;
 
  error_exit:
-  ERR_clear_error ();
+  crypto_clear_error();
   buf->len = 0;
   gc_free (&gc);
   return false;

diff --git a/crypto_backend.h b/crypto_backend.h
index b099f475ed359e3123ea75bfa2e746a370b72357..50eef7b9a6933204532551e6207ba25c3a03f9d1 100644 (file)
--- a/crypto_backend.h
+++ b/crypto_backend.h
@@ -38,6 +38,8 @@
 
 #include "basic.h"
 
+void crypto_clear_error (void);
+
 void show_available_ciphers (void);
 
 void show_available_digests (void);

diff --git a/crypto_openssl.c b/crypto_openssl.c
index 9edcf40b5541cbacaf91998fa34fdcf4985998d3..8e228eef0fee3ef67f4e66176179c7d7381fc7c5 100644 (file)
--- a/crypto_openssl.c
+++ b/crypto_openssl.c
@@ -86,6 +86,12 @@ cipher_ok (const char* name)
 
 #endif
 
+void
+crypto_clear_error (void)
+{
+  ERR_clear_error ();
+}
+
 void
 show_available_ciphers ()
 {