mirrors/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-11-27 19:53:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix extract_x509_field_ssl for external objects, v2

Browse Source 
Only fields known to OpenSSL have a NID. OBJ_txt2obj allows specifying
fields by numeric OID.

Signed-off-by: Hristo Venev <hristo@venev.name>
Acked-by: Steffan Karger <steffan@karger.me>
Message-Id: <1493853048.30207.1.camel@venev.name>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14535.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
This commit is contained in:
Hristo Venev 2017-05-04 00:10:48 +01:00 committed by David Sommerseth
parent 7ad9177601
commit 69311687da
No known key found for this signature in database
GPG Key ID: 86CF944C9671FDF2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openvpn/ssl_verify_openssl.c
View File

@ -191,16 +191,24 @@ extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out,
X509_NAME_ENTRY *x509ne = 0;
ASN1_STRING *asn1 = 0;
unsigned char *buf = NULL;
int nid = OBJ_txt2nid(field_name);
ASN1_OBJECT *field_name_obj = OBJ_txt2obj(field_name, 0);
if (field_name_obj == NULL)
{
msg(D_TLS_ERRORS, "Invalid X509 attribute name '%s'", field_name);
return FAILURE;
}
ASSERT(size > 0);
*out = '\0';
do
{
lastpos = tmp;
tmp = X509_NAME_get_index_by_NID(x509, nid, lastpos);
tmp = X509_NAME_get_index_by_OBJ(x509, field_name_obj, lastpos);
} while (tmp > -1);
ASN1_OBJECT_free(field_name_obj);
/* Nothing found */
if (lastpos == -1)
{