diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-02-14 11:48:37 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-02-14 11:48:37 +0100 |
| commit | c198dbd9dd583d980ae7e70118f67d09bed8de55 (patch) | |
| tree | c2863f28134af00f26299c97bb6a81ed0aa4ed96 /app/openvpn/src/openvpn/error.c | |
| parent | 9d346be65e6808710b9e814d2899e5888984b4ab (diff) | |
| parent | 4028c100a59c45913cb569c4967faaddc090b1f9 (diff) | |
Merge branch 'develop'0.9.2
Diffstat (limited to 'app/openvpn/src/openvpn/error.c')
| -rw-r--r-- | app/openvpn/src/openvpn/error.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/app/openvpn/src/openvpn/error.c b/app/openvpn/src/openvpn/error.c index af865f32..72ebfab6 100644 --- a/app/openvpn/src/openvpn/error.c +++ b/app/openvpn/src/openvpn/error.c @@ -43,13 +43,6 @@ #include "ps.h" #include "mstats.h" -#ifdef ENABLE_CRYPTO -#ifdef ENABLE_CRYPTO_OPENSSL -#include <openssl/err.h> -#endif -#endif - -#include "memdbg.h" #if SYSLOG_CAPABILITY #ifndef LOG_OPENVPN @@ -269,28 +262,6 @@ void x_msg_va (const unsigned int flags, const char *format, va_list arglist) SWAP; } -#ifdef ENABLE_CRYPTO -#ifdef ENABLE_CRYPTO_OPENSSL - if (flags & M_SSL) - { - int nerrs = 0; - size_t err; - while ((err = ERR_get_error ())) - { - openvpn_snprintf (m2, ERR_BUF_SIZE, "%s: %s", - m1, ERR_error_string (err, NULL)); - SWAP; - ++nerrs; - } - if (!nerrs) - { - openvpn_snprintf (m2, ERR_BUF_SIZE, "%s (OpenSSL)", m1); - SWAP; - } - } -#endif -#endif - if (flags & M_OPTERR) { openvpn_snprintf (m2, ERR_BUF_SIZE, "Options error: %s", m1); |