Select subjectAltName address family using address length in x509 plugin

diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 7b362b962ba6c24b2a83ccade19c396d512a2ad8..8a164f1bdfe91005fc731f1525a24b61f113607e 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -366,7 +366,17 @@ static identification_t *parse_generalName(chunk_t blob, int level0)
                                id_type = ID_DER_ASN1_DN;
                                break;
                        case GN_OBJ_IP_ADDRESS:
-                               id_type = ID_IPV4_ADDR;
+                               switch (object.len)
+                               {
+                                       case 4:
+                                               id_type = ID_IPV4_ADDR;
+                                               break;
+                                       case 16:
+                                               id_type = ID_IPV6_ADDR;
+                                               break;
+                                       default:
+                                               break;
+                               }
                                break;
                        case GN_OBJ_OTHER_NAME:
                                if (!parse_otherName(object, parser->get_level(parser)+1))