From 1f0e3d11142ca01a3bfe812fd150efa1aeb0d89a Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 23 May 2006 08:12:36 +0000
Subject: [PATCH] moved definition of generalNames_t to identification.h

---
 src/libstrongswan/utils/identification.c | 25 +++++-------------------
 src/libstrongswan/utils/identification.h | 17 ++++++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
index 9c17ac54c..8132d6ed5 100644
--- a/src/libstrongswan/utils/identification.c
+++ b/src/libstrongswan/utils/identification.c
@@ -36,14 +36,14 @@
  * String mappings for id_type_t.
  */
 mapping_t id_type_m[] = {
-	{ID_IPV4_ADDR, "ID_IPV4_ADDR"},
-	{ID_FQDN, "ID_FQDN"},
+	{ID_IPV4_ADDR,	 "ID_IPV4_ADDR"},
+	{ID_FQDN,		 "ID_FQDN"},
 	{ID_RFC822_ADDR, "ID_RFC822_ADDR"},
-	{ID_IPV6_ADDR, "ID_IPV6_ADDR"},
+	{ID_IPV6_ADDR,	 "ID_IPV6_ADDR"},
 	{ID_DER_ASN1_DN, "ID_DER_ASN1_DN"},
 	{ID_DER_ASN1_GN, "ID_DER_ASN1_GN"},
-	{ID_KEY_ID, "ID_KEY_ID"},
-	{ID_ANY, "ID_ANY"},
+	{ID_KEY_ID,		 "ID_KEY_ID"},
+	{ID_ANY,		 "ID_ANY"},
 	{MAPPING_END, NULL}
 };
 
@@ -161,21 +161,6 @@ static const x501rdn_t x501rdns[] = {
 };
 #define X501_RDN_ROOF   26
 
-/**
- * Different kinds of generalNames
- */
-enum generalNames_t {
-	GN_OTHER_NAME =		0,
-	GN_RFC822_NAME =	1,
-	GN_DNS_NAME =		2,
-	GN_X400_ADDRESS =	3,
-	GN_DIRECTORY_NAME =	4,
-	GN_EDI_PARTY_NAME = 5,
-	GN_URI =			6,
-	GN_IP_ADDRESS =		7,
-	GN_REGISTERED_ID =	8,
-};
-
 /**
  * ASN.1 definition of generalName 
  */
diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h
index 309b6858c..e1e147fab 100644
--- a/src/libstrongswan/utils/identification.h
+++ b/src/libstrongswan/utils/identification.h
@@ -90,6 +90,23 @@ enum id_type_t {
  */
 extern mapping_t id_type_m[];
 
+/**
+ * Different kinds of generalNames
+ */
+typedef enum generalNames_t generalNames_t;
+
+enum generalNames_t {
+	GN_OTHER_NAME =		0,
+	GN_RFC822_NAME =	1,
+	GN_DNS_NAME =		2,
+	GN_X400_ADDRESS =	3,
+	GN_DIRECTORY_NAME =	4,
+	GN_EDI_PARTY_NAME = 5,
+	GN_URI =			6,
+	GN_IP_ADDRESS =		7,
+	GN_REGISTERED_ID =	8,
+};
+
 typedef struct identification_t identification_t;
 
 /**