The unified diff between revisions [84c381b3..] and [48b49b84..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/config.cpp'

#
#
# patch "src/config.cpp"
#  from [d1a6945a30c4c65d90a42b9910a8256d4afc4784]
#    to [ff5bbdf754d3f6d5ab8b0b6ea331153b6a9f30f0]
#
============================================================
--- src/config.cpp	d1a6945a30c4c65d90a42b9910a8256d4afc4784
+++ src/config.cpp	ff5bbdf754d3f6d5ab8b0b6ea331153b6a9f30f0
@@ -122,14 +122,6 @@ std::string Config::option(const std::st
    }

 /*************************************************
-* Get the config setting as a u32bit             *
-*************************************************/
-u32bit Config::option_as_u32bit(const std::string& key) const
-   {
-   return parse_expr(option(key));
-   }
-
-/*************************************************
 * Get the config setting as a time               *
 *************************************************/
 u32bit Config::option_as_time(const std::string& key) const
@@ -163,33 +155,4 @@ u32bit Config::option_as_time(const std:
    return scale * to_u32bit(value);
    }

-/*************************************************
-* Choose the signature format for a PK algorithm *
-*************************************************/
-void Config::choose_sig_format(const std::string& algo_name,
-                               std::string& padding,
-                               Signature_Format& format)
-   {
-   if(algo_name == "RSA")
-      {
-      std::string hash = global_state().config().option("x509/ca/rsa_hash");
-
-      if(hash == "")
-         throw Invalid_State("No value set for x509/ca/rsa_hash");
-
-      hash = global_state().config().deref_alias(hash);
-
-      padding = "EMSA3(" + hash + ")";
-      format = IEEE_1363;
-      }
-   else if(algo_name == "DSA")
-      {
-      std::string hash = global_state().config().deref_alias("SHA-1");
-      padding = "EMSA1(" + hash + ")";
-      format = DER_SEQUENCE;
-      }
-   else
-      throw Invalid_Argument("Unknown X.509 signing key type: " + algo_name);
-   }
-
 }