From 2e64e69c8d7836d14e059c474bb6bd667e7bb52f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 2 Jul 2013 14:00:57 +0100
Subject: More master merge bits.

---
 src/util.cc | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'src/util.cc')

diff --git a/src/util.cc b/src/util.cc
index 0c63c305..e4c8122c 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -307,20 +307,6 @@ libdcp::init ()
 	if (xmlSecInit() < 0) {
 		throw MiscError ("could not initialise xmlsec");
 	}
-
-#ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING
-	if (xmlSecCryptoDLLoadLibrary (BAD_CAST XMLSEC_CRYPTO) < 0) {
-		throw MiscError ("unable to load default xmlsec-crypto library");
-	}
-#endif
-	
-	if (xmlSecCryptoAppInit (0) < 0) {
-		throw MiscError ("could not initialise crypto library");
-	}
-	
-	if (xmlSecCryptoInit() < 0) {
-		throw MiscError ("could not initialise xmlsec-crypto");
-	}
 }
 
 void
@@ -348,19 +334,6 @@ libdcp::add_signature_value (xmlpp::Element* parent, CertificateChain const & ce
 	if (!keys_manager) {
 		throw MiscError ("could not create keys manager");
 	}
-	if (xmlSecCryptoAppDefaultKeysMngrInit (keys_manager) < 0) {
-		throw MiscError ("could not initialise keys manager");
-	}
-	
-	xmlSecKeyPtr const key = xmlSecCryptoAppKeyLoad (signer_key.c_str(), xmlSecKeyDataFormatPem, 0, 0, 0);
-	if (key == 0) {
-		throw MiscError ("could not load signer key");
-		}
-	
-	if (xmlSecCryptoAppDefaultKeysMngrAdoptKey (keys_manager, key) < 0) {
-		xmlSecKeyDestroy (key);
-		throw MiscError ("could not use signer key");
-	}
 	
 	xmlSecDSigCtx signature_context;
 	
-- 
cgit v1.2.3