From 32937ed3ab5cb51ad175d602d466cbb9dfe917ad Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 30 Jun 2008 04:34:54 +0000
Subject: Remove the free-standing function deref_alias. It only served as a
 forwarder for the implementation in Library_State. Instead explicitly call
 deref_alias on global_state() wherever the old freestanding version was used.
 This serves to make (more) uses of the global state explicit rather than
 implicit.

---
 src/get_enc.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/get_enc.cpp')

diff --git a/src/get_enc.cpp b/src/get_enc.cpp
index 19c2da03a..17e28e9d9 100644
--- a/src/get_enc.cpp
+++ b/src/get_enc.cpp
@@ -4,6 +4,7 @@
 *************************************************/
 
 #include <botan/lookup.h>
+#include <botan/libstate.h>
 #include <botan/parsing.h>
 #include <botan/emsa.h>
 #include <botan/eme.h>
@@ -19,7 +20,7 @@ namespace Botan {
 EMSA* get_emsa(const std::string& algo_spec)
    {
    std::vector<std::string> name = parse_algorithm_name(algo_spec);
-   const std::string emsa_name = deref_alias(name[0]);
+   const std::string emsa_name = global_state().deref_alias(name[0]);
 
    if(emsa_name == "Raw")
       {
@@ -62,7 +63,7 @@ EMSA* get_emsa(const std::string& algo_spec)
 EME* get_eme(const std::string& algo_spec)
    {
    std::vector<std::string> name = parse_algorithm_name(algo_spec);
-   const std::string eme_name = deref_alias(name[0]);
+   const std::string eme_name = global_state().deref_alias(name[0]);
 
    if(eme_name == "PKCS1v15")
       {
@@ -88,7 +89,7 @@ EME* get_eme(const std::string& algo_spec)
 KDF* get_kdf(const std::string& algo_spec)
    {
    std::vector<std::string> name = parse_algorithm_name(algo_spec);
-   const std::string kdf_name = deref_alias(name[0]);
+   const std::string kdf_name = global_state().deref_alias(name[0]);
 
    if(kdf_name == "KDF1")
       {
@@ -117,7 +118,7 @@ KDF* get_kdf(const std::string& algo_spec)
 MGF* get_mgf(const std::string& algo_spec)
    {
    std::vector<std::string> name = parse_algorithm_name(algo_spec);
-   const std::string mgf_name = deref_alias(name[0]);
+   const std::string mgf_name = global_state().deref_alias(name[0]);
 
    if(mgf_name == "MGF1")
       {
-- 
cgit v1.2.3