Merge branch 'uri-san'

Adds support to encode SANs of type uniformResourceIdentifier in
certificates.  They currently don't have any use in strongSwan, but
might be required for other applications.

Closes strongswan/strongswan#1983

src/libstrongswan/plugins/x509/x509_cert.c

@@ -2069,6 +2069,9 @@ static chunk_t build_generalName(identification_t *id)
 		case ID_DER_ASN1_DN:
 			context = ASN1_CONTEXT_C_4;
 			break;
+		case ID_DER_ASN1_GN_URI:
+			context = ASN1_CONTEXT_S_6;
+			break;
 		case ID_IPV4_ADDR:
 		case ID_IPV6_ADDR:
 		case ID_IPV4_ADDR_SUBNET:

src/libstrongswan/utils/identification.c

@@ -1441,6 +1441,7 @@ static private_identification_t* create_from_string_with_prefix_type(char *str)
 		{ "asn1gn:",		ID_DER_ASN1_GN			},
 		{ "xmppaddr:",		ID_DER_ASN1_GN          },
 		{ "keyid:",			ID_KEY_ID				},
+		{ "uri:",			ID_DER_ASN1_GN_URI		},
 	};
 	private_identification_t *this;
 	int i;