From: Martin Willi <martin@revosec.ch>
Date: Tue, 10 Aug 2010 15:43:48 +0000 (+0200)
Subject: Parse UPN subjectAltName in openssl plugin
X-Git-Tag: 4.5.0~539
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0a8aaaf4ffa9a74a7978e902fb9bea270efb8b2;p=thirdparty%2Fstrongswan.git

Parse UPN subjectAltName in openssl plugin
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_x509.c b/src/libstrongswan/plugins/openssl/openssl_x509.c
index 1c9bb699e9..4659e1e889 100644
--- a/src/libstrongswan/plugins/openssl/openssl_x509.c
+++ b/src/libstrongswan/plugins/openssl/openssl_x509.c
@@ -187,6 +187,15 @@ static identification_t *general_name2id(GENERAL_NAME *name)
 		}
 		case GEN_DIRNAME :
 			return openssl_x509_name2id(name->d.directoryName);
+		case GEN_OTHERNAME:
+			if (OBJ_obj2nid(name->d.otherName->type_id) == NID_ms_upn &&
+				name->d.otherName->value->type == V_ASN1_UTF8STRING)
+			{
+				return identification_create_from_encoding(ID_RFC822_ADDR,
+							openssl_asn1_str2chunk(
+								name->d.otherName->value->value.utf8string));
+			}
+			return NULL;
 		default:
 			return NULL;
 	}