summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2015-03-05 22:58:35 +0100
committerGert Doering <gert@greenie.muc.de>2015-03-06 19:33:58 +0100
commit48e5e425b7568d8fbd2e32517b7c358dbb6d4c5f (patch)
treeb87e97db5f1e58584fe34c8e6985653f637637e0 /src
parent77f464bddcfcc958f10fd3e9c45e1cb46d5206d0 (diff)
downloadopenvpn-48e5e425b7568d8fbd2e32517b7c358dbb6d4c5f.tar.gz
openvpn-48e5e425b7568d8fbd2e32517b7c358dbb6d4c5f.tar.xz
openvpn-48e5e425b7568d8fbd2e32517b7c358dbb6d4c5f.zip
Get rid of old OpenSSL workarounds.
We now only support OpenSSL 0.9.8+, so we don't have to work around the bug in 0.9.6b anymore. Also, OBJ_txt2nid() now takes a const char * (instead of a char *), so we no langer have to cast away const. Signed-off-by: Steffan Karger <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1425592716-14243-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9512 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
-rw-r--r--src/openvpn/ssl_verify_openssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c
index 0348e98..81b2e38 100644
--- a/src/openvpn/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -169,8 +169,8 @@ extract_x509_field_ssl (X509_NAME *x509, const char *field_name, char *out,
int tmp = -1;
X509_NAME_ENTRY *x509ne = 0;
ASN1_STRING *asn1 = 0;
- unsigned char *buf = (unsigned char *)1; /* bug in OpenSSL 0.9.6b ASN1_STRING_to_UTF8 requires this workaround */
- int nid = OBJ_txt2nid((char *)field_name);
+ unsigned char *buf = NULL;
+ int nid = OBJ_txt2nid(field_name);
ASSERT (size > 0);
*out = '\0';