Updated x509 plugin to the new builder API
[strongswan.git] / src / libstrongswan / plugins / x509 / x509_plugin.c
index b7e8b5b..1c5a33b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Martin Willi
+ * Copyright (C) 2008-2009 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -41,15 +41,19 @@ struct private_x509_plugin_t {
 static void destroy(private_x509_plugin_t *this)
 {
        lib->creds->remove_builder(lib->creds,
-                                                          (builder_constructor_t)x509_cert_builder);
+                                                          (builder_function_t)x509_cert_gen);
        lib->creds->remove_builder(lib->creds,
-                                                          (builder_constructor_t)x509_ac_builder);
+                                                          (builder_function_t)x509_cert_load);
        lib->creds->remove_builder(lib->creds,
-                                                          (builder_constructor_t)x509_crl_builder);
+                                                          (builder_function_t)x509_ac_gen);
        lib->creds->remove_builder(lib->creds,
-                                                          (builder_constructor_t)x509_ocsp_request_builder);
+                                                          (builder_function_t)x509_ac_load);
        lib->creds->remove_builder(lib->creds,
-                                                          (builder_constructor_t)x509_ocsp_response_builder);
+                                                          (builder_function_t)x509_crl_load);
+       lib->creds->remove_builder(lib->creds,
+                                                          (builder_function_t)x509_ocsp_request_gen);
+       lib->creds->remove_builder(lib->creds,
+                                                          (builder_function_t)x509_ocsp_response_load);
        free(this);
 }
 
@@ -63,15 +67,19 @@ plugin_t *plugin_create()
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
 
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509,
-                                                       (builder_constructor_t)x509_cert_builder);
+                                                       (builder_function_t)x509_cert_gen);
+       lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509,
+                                                       (builder_function_t)x509_cert_load);
+       lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509_AC,
+                                                       (builder_function_t)x509_ac_gen);
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509_AC,
-                                                       (builder_constructor_t)x509_ac_builder);
+                                                       (builder_function_t)x509_ac_load);
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509_CRL,
-                                                       (builder_constructor_t)x509_crl_builder);
+                                                       (builder_function_t)x509_crl_load);
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509_OCSP_REQUEST,
-                                                       (builder_constructor_t)x509_ocsp_request_builder);
+                                                       (builder_function_t)x509_ocsp_request_gen);
        lib->creds->add_builder(lib->creds, CRED_CERTIFICATE, CERT_X509_OCSP_RESPONSE,
-                                                       (builder_constructor_t)x509_ocsp_response_builder);
+                                                       (builder_function_t)x509_ocsp_response_load);
 
        return &this->public.plugin;
 }