Move ocsp_responder_t interface as it's not a certificate

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 0597afad9664354e4f52482545b6c9c2586501a7..e28a9b765a9bcd38c5f22e1c3360d1f0769b6e52 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -94,12 +94,12 @@ credentials/certificates/ac.h credentials/certificates/crl.h \
 credentials/certificates/pkcs10.h credentials/certificates/ocsp_request.h \
 credentials/certificates/ocsp_single_response.h \
 credentials/certificates/ocsp_response.h \
-credentials/certificates/ocsp_responder.h \
 credentials/certificates/pgp_certificate.h \
 credentials/certificates/certificate_printer.h \
 credentials/containers/container.h credentials/containers/pkcs7.h \
 credentials/containers/pkcs12.h \
 credentials/credential_manager.h credentials/ocsp_responders.h \
+credentials/ocsp_responder.h \
 credentials/sets/auth_cfg_wrapper.h credentials/sets/ocsp_response_wrapper.h \
 credentials/sets/cert_cache.h credentials/sets/mem_cred.h \
 credentials/sets/callback_cred.h credentials/auth_cfg.h \

diff --git a/src/libstrongswan/credentials/certificates/ocsp_responder.h b/src/libstrongswan/credentials/ocsp_responder.h
similarity index 98%
rename from src/libstrongswan/credentials/certificates/ocsp_responder.h
rename to src/libstrongswan/credentials/ocsp_responder.h
index 57896ace1ba27bded7c0242c5abb068d7c4d1f86..07295452425fde029c13bccd5d5541c4ce09f647 100644 (file)
--- a/src/libstrongswan/credentials/certificates/ocsp_responder.h
+++ b/src/libstrongswan/credentials/ocsp_responder.h
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup ocsp_responder ocsp_responder
- * @{ @ingroup certificates
+ * @{ @ingroup credentials
  */
 
 #ifndef OCSP_RESPONDER_H_

diff --git a/src/libstrongswan/credentials/ocsp_responders.h b/src/libstrongswan/credentials/ocsp_responders.h
index d4ce331a67d9fede938e186b0852ae924e821431..af686700e8452f0b19e5b74a6cdec90c20581fa1 100644 (file)
--- a/src/libstrongswan/credentials/ocsp_responders.h
+++ b/src/libstrongswan/credentials/ocsp_responders.h
@@ -24,7 +24,7 @@
 
 typedef struct ocsp_responders_t ocsp_responders_t;
 
-#include <credentials/certificates/ocsp_responder.h>
+#include <credentials/ocsp_responder.h>
 
 /**
  * Manages OCSP responders.

diff --git a/src/libstrongswan/plugins/openxpki/openxpki_ocsp_responder.h b/src/libstrongswan/plugins/openxpki/openxpki_ocsp_responder.h
index 5b4365c970c544db460a549e363a04c094d4928a..827e827f6e6ec3e70b47abafb03765f245691361 100644 (file)
--- a/src/libstrongswan/plugins/openxpki/openxpki_ocsp_responder.h
+++ b/src/libstrongswan/plugins/openxpki/openxpki_ocsp_responder.h
@@ -24,7 +24,7 @@
 
 typedef struct openxpki_ocsp_responder_t openxpki_ocsp_responder_t;
 
-#include <credentials/certificates/ocsp_responder.h>
+#include <credentials/ocsp_responder.h>
 
 /**
  * OCSP responder implementation using OpenXPKI.

diff --git a/src/pki/ocsp/index_responder.h b/src/pki/ocsp/index_responder.h
index c126b36149c1e7b18c1bd191bc91839667f79fb7..0f60cd73e185c265b9ed7fa1e1a52959d432342a 100644 (file)
--- a/src/pki/ocsp/index_responder.h
+++ b/src/pki/ocsp/index_responder.h
@@ -22,7 +22,7 @@
 #ifndef INDEX_RESPONDER_H_
 #define INDEX_RESPONDER_H_
 
-#include <credentials/certificates/ocsp_responder.h>
+#include <credentials/ocsp_responder.h>
 
 /**
  * Create an index.txt-based OCSP responder for the given CA and file.