From 75f74f92f068309b2c77d83340008ef7e9c6d2df Mon Sep 17 00:00:00 2001
From: Nokis Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 20 Feb 2008 19:59:41 +0000
Subject: added new branch

---
(limited to 'src/gnutls_config.c')

diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index f08512e..8d6308a 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -1,6 +1,5 @@
 /**
  *  Copyright 2004-2005 Paul Querna
- *  Copyright 2007 Nikos Mavrogiannopoulos
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -203,84 +202,6 @@ const char *mgs_set_key_file(cmd_parms * parms, void *dummy,
     return NULL;
 }
 
-const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy,
-			      const char *arg)
-{
-    int ret;
-    gnutls_datum_t data;
-    const char *file;
-    apr_pool_t *spool;
-    mgs_srvconf_rec *sc =
-	(mgs_srvconf_rec *) ap_get_module_config(parms->server->
-						 module_config,
-						 &gnutls_module);
-    apr_pool_create(&spool, parms->pool);
-
-    file = ap_server_root_relative(spool, arg);
-
-    if (load_datum_from_file(spool, file, &data) != 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
-			    "Certificate '%s'", file);
-    }
-
-    ret = gnutls_openpgp_crt_init( &sc->cert_pgp);
-    if (ret < 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to Init "
-			    "PGP Certificate: (%d) %s", ret,
-			    gnutls_strerror(ret));
-    }
-      
-    ret =
-	gnutls_openpgp_crt_import(sc->cert_pgp, &data, GNUTLS_OPENPGP_FMT_BASE64);
-    if (ret < 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
-			    "PGP Certificate '%s': (%d) %s", file, ret,
-			    gnutls_strerror(ret));
-    }
-
-    apr_pool_destroy(spool);
-    return NULL;
-}
-
-const char *mgs_set_pgpkey_file(cmd_parms * parms, void *dummy,
-			     const char *arg)
-{
-    int ret;
-    gnutls_datum_t data;
-    const char *file;
-    apr_pool_t *spool;
-    mgs_srvconf_rec *sc =
-	(mgs_srvconf_rec *) ap_get_module_config(parms->server->
-						 module_config,
-						 &gnutls_module);
-    apr_pool_create(&spool, parms->pool);
-
-    file = ap_server_root_relative(spool, arg);
-
-    if (load_datum_from_file(spool, file, &data) != 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
-			    "Private Key '%s'", file);
-    }
-
-    ret = gnutls_openpgp_privkey_init(&sc->privkey_pgp);
-    if (ret < 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to initialize"
-			    ": (%d) %s", ret, gnutls_strerror(ret));
-    }
-
-    ret =
-	gnutls_openpgp_privkey_import(sc->privkey_pgp, &data,
-				   GNUTLS_OPENPGP_FMT_BASE64, NULL, 0);
-    if (ret != 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
-			    "PGP Private Key '%s': (%d) %s", file, ret,
-			    gnutls_strerror(ret));
-    }
-    apr_pool_destroy(spool);
-    return NULL;
-}
-
-
 const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
 				     const char *arg)
 {
@@ -429,44 +350,6 @@ const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
     return NULL;
 }
 
-const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
-				   const char *arg)
-{
-    int rv;
-    const char *file;
-    apr_pool_t *spool;
-    gnutls_datum_t data;
-
-    mgs_srvconf_rec *sc =
-	(mgs_srvconf_rec *) ap_get_module_config(parms->server->
-						 module_config,
-						 &gnutls_module);
-    apr_pool_create(&spool, parms->pool);
-
-    file = ap_server_root_relative(spool, arg);
-
-    if (load_datum_from_file(spool, file, &data) != 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
-			    "Keyring File '%s'", file);
-    }
-
-    rv = gnutls_openpgp_keyring_init(&sc->pgp_list);
-    if (rv < 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to initialize"
-			    "keyring: (%d) %s", rv, gnutls_strerror(rv));
-    }
-
-    rv = gnutls_openpgp_keyring_import(sc->pgp_list, &data, GNUTLS_OPENPGP_FMT_BASE64);
-    if (rv < 0) {
-	return apr_psprintf(parms->pool, "GnuTLS: Failed to load "
-			    "Keyring File '%s': (%d) %s", file, rv,
-			    gnutls_strerror(rv));
-    }
-
-    apr_pool_destroy(spool);
-    return NULL;
-}
-
 const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
 			    const char *arg)
 {
--
cgit v0.9.2