From: Martin Willi <martin@revosec.ch>
Date: Fri, 3 Dec 2010 12:23:59 +0000 (+0100)
Subject: Remove x509_flag_names, flags do not work with ENUM()
X-Git-Tag: 4.5.1~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e49bd37b5da0155c0b83fe0217a09aaf528b6686;p=thirdparty%2Fstrongswan.git

Remove x509_flag_names, flags do not work with ENUM()
---

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 7cd90a9b56..5853e97ace 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -30,8 +30,7 @@ credentials/keys/private_key.c credentials/keys/private_key.h \
 credentials/keys/public_key.c credentials/keys/public_key.h \
 credentials/keys/shared_key.c credentials/keys/shared_key.h \
 credentials/certificates/certificate.c credentials/certificates/certificate.h \
-credentials/certificates/x509.h credentials/certificates/x509.c \
-credentials/certificates/ac.h \
+credentials/certificates/x509.h credentials/certificates/ac.h \
 credentials/certificates/crl.h credentials/certificates/crl.c \
 credentials/certificates/pkcs10.h \
 credentials/certificates/ocsp_request.h \
diff --git a/src/libstrongswan/credentials/certificates/x509.c b/src/libstrongswan/credentials/certificates/x509.c
deleted file mode 100644
index 66dc192c1e..0000000000
--- a/src/libstrongswan/credentials/certificates/x509.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "x509.h"
-
-ENUM(x509_flag_names, X509_NONE, X509_IP_ADDR_BLOCKS,
-	"X509_NONE",
-	"X509_CA",
-	"X509_AA",
-	"X509_OCSP_SIGNER",
-	"X509_SERVER_AUTH",
-	"X509_CLIENT_AUTH",
-	"X509_SELF_SIGNED",
-	"X509_IP_ADDR_BLOCKS",
-);
-
diff --git a/src/libstrongswan/credentials/certificates/x509.h b/src/libstrongswan/credentials/certificates/x509.h
index 3f1c4b738f..394b613d8d 100644
--- a/src/libstrongswan/credentials/certificates/x509.h
+++ b/src/libstrongswan/credentials/certificates/x509.h
@@ -51,11 +51,6 @@ enum x509_flag_t {
 	X509_IP_ADDR_BLOCKS =	(1<<6),
 };
 
-/**
- * enum names for x509 flags
- */
-extern enum_name_t *x509_flag_names;
-
 /**
  * X.509 certificate interface.
  *