Remove a declaration for add_alias, which was removed at some point

without the decl also being removed.

Add an add_alias function to the Config class, just a simple wrapper
around Config::set

Change policy.cpp to use add_alias instead of set when setting an alias

4 files changed, 47 insertions, 42 deletions

diff --git a/include/config.h b/include/config.h
index e230314a7..1612cd7e7 100644
--- a/include/config.h
+++ b/include/config.h
@@ -32,7 +32,9 @@ class Config
       bool option_as_bool(const std::string&) const;
       std::vector<std::string> option_as_list(const std::string&) const;
 
+      void add_alias(const std::string&, const std::string&);
       std::string deref_alias(const std::string&) const;
+
       std::string option(const std::string&) const;
 
       void load_inifile(const std::string&);
diff --git a/include/look_add.h b/include/look_add.h
index e6cc265b0..1e06472fe 100644
--- a/include/look_add.h
+++ b/include/look_add.h
@@ -22,11 +22,6 @@ void add_algorithm(MessageAuthenticationCode*);
 void add_algorithm(S2K*);
 void add_algorithm(BlockCipherModePaddingMethod*);
 
-/*************************************************
-* Add an alias for an algorithm                  *
-*************************************************/
-void add_alias(const std::string&, const std::string&);
-
 }
 
 #endif
diff --git a/src/config.cpp b/src/config.cpp
index 2e0a6609d..a3bcfa1fd 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -63,6 +63,14 @@ void Config::set(const std::string& section, const std::string& key,
    }
 
 /*************************************************
+* Add an alias                                   *
+*************************************************/
+void Config::add_alias(const std::string& key, const std::string& value)
+   {
+   set("alias", key, value);
+   }
+
+/*************************************************
 * Dereference an alias to a fixed name           *
 *************************************************/
 std::string Config::deref_alias(const std::string& key) const
diff --git a/src/policy.cpp b/src/policy.cpp
index 2a5329e89..7ddeb8c14 100644
--- a/src/policy.cpp
+++ b/src/policy.cpp
@@ -137,43 +137,43 @@ void set_default_oids(Config& config)
 *************************************************/
 void set_default_aliases(Config& config)
    {
-   config.set("alias", "OpenPGP.Cipher.1",  "IDEA");
-   config.set("alias", "OpenPGP.Cipher.2",  "TripleDES");
-   config.set("alias", "OpenPGP.Cipher.3",  "CAST-128");
-   config.set("alias", "OpenPGP.Cipher.4",  "Blowfish");
-   config.set("alias", "OpenPGP.Cipher.5",  "SAFER-SK(13)");
-   config.set("alias", "OpenPGP.Cipher.7",  "AES-128");
-   config.set("alias", "OpenPGP.Cipher.8",  "AES-192");
-   config.set("alias", "OpenPGP.Cipher.9",  "AES-256");
-   config.set("alias", "OpenPGP.Cipher.10", "Twofish");
-
-   config.set("alias", "OpenPGP.Digest.1", "MD5");
-   config.set("alias", "OpenPGP.Digest.2", "SHA-1");
-   config.set("alias", "OpenPGP.Digest.3", "RIPEMD-160");
-   config.set("alias", "OpenPGP.Digest.5", "MD2");
-   config.set("alias", "OpenPGP.Digest.6", "Tiger(24,3)");
-   config.set("alias", "OpenPGP.Digest.7", "HAVAL(20,5)");
-   config.set("alias", "OpenPGP.Digest.8", "SHA-256");
-
-   config.set("alias", "TLS.Digest.0",     "Parallel(MD5,SHA-160)");
-
-   config.set("alias", "EME-PKCS1-v1_5",  "PKCS1v15");
-   config.set("alias", "OAEP-MGF1",       "EME1");
-   config.set("alias", "EME-OAEP",        "EME1");
-   config.set("alias", "X9.31",           "EMSA2");
-   config.set("alias", "EMSA-PKCS1-v1_5", "EMSA3");
-   config.set("alias", "PSS-MGF1",        "EMSA4");
-   config.set("alias", "EMSA-PSS",        "EMSA4");
-
-   config.set("alias", "Rijndael", "AES");
-   config.set("alias", "3DES",     "TripleDES");
-   config.set("alias", "DES-EDE",  "TripleDES");
-   config.set("alias", "CAST5",    "CAST-128");
-   config.set("alias", "SHA1",     "SHA-160");
-   config.set("alias", "SHA-1",    "SHA-160");
-   config.set("alias", "SEAL",     "SEAL-3.0-BE");
-   config.set("alias", "MARK-4",   "ARC4(256)");
-   config.set("alias", "OMAC",     "CMAC");
+   config.add_alias("OpenPGP.Cipher.1",  "IDEA");
+   config.add_alias("OpenPGP.Cipher.2",  "TripleDES");
+   config.add_alias("OpenPGP.Cipher.3",  "CAST-128");
+   config.add_alias("OpenPGP.Cipher.4",  "Blowfish");
+   config.add_alias("OpenPGP.Cipher.5",  "SAFER-SK(13)");
+   config.add_alias("OpenPGP.Cipher.7",  "AES-128");
+   config.add_alias("OpenPGP.Cipher.8",  "AES-192");
+   config.add_alias("OpenPGP.Cipher.9",  "AES-256");
+   config.add_alias("OpenPGP.Cipher.10", "Twofish");
+
+   config.add_alias("OpenPGP.Digest.1", "MD5");
+   config.add_alias("OpenPGP.Digest.2", "SHA-1");
+   config.add_alias("OpenPGP.Digest.3", "RIPEMD-160");
+   config.add_alias("OpenPGP.Digest.5", "MD2");
+   config.add_alias("OpenPGP.Digest.6", "Tiger(24,3)");
+   config.add_alias("OpenPGP.Digest.7", "HAVAL(20,5)");
+   config.add_alias("OpenPGP.Digest.8", "SHA-256");
+
+   config.add_alias("TLS.Digest.0",     "Parallel(MD5,SHA-160)");
+
+   config.add_alias("EME-PKCS1-v1_5",  "PKCS1v15");
+   config.add_alias("OAEP-MGF1",       "EME1");
+   config.add_alias("EME-OAEP",        "EME1");
+   config.add_alias("X9.31",           "EMSA2");
+   config.add_alias("EMSA-PKCS1-v1_5", "EMSA3");
+   config.add_alias("PSS-MGF1",        "EMSA4");
+   config.add_alias("EMSA-PSS",        "EMSA4");
+
+   config.add_alias("Rijndael", "AES");
+   config.add_alias("3DES",     "TripleDES");
+   config.add_alias("DES-EDE",  "TripleDES");
+   config.add_alias("CAST5",    "CAST-128");
+   config.add_alias("SHA1",     "SHA-160");
+   config.add_alias("SHA-1",    "SHA-160");
+   config.add_alias("SEAL",     "SEAL-3.0-BE");
+   config.add_alias("MARK-4",   "ARC4(256)");
+   config.add_alias("OMAC",     "CMAC");
    }
 
 /*************************************************