Remove support for provider identifiers from SCAN_Name - it turns out this

was not the right place to keep track of this information. Also modify
all Algorithm_Factory constructor functions to take instead of a SCAN_Name
a pair of std::strings - the SCAN name and an optional provider name. If
a provider is specified, either that provider will be used or the request
will fail. Otherwise, the library will attempt best effort, based on
user-set algorithm implementation settings (combine with benchmark.h for
choosing the fastest implementation at runtime) or if not set, a static
ordering (preset in static_provider_weight in prov_weight.cpp, though it
would be nice to make this easier to toggle).

1 files changed, 1 insertions, 1 deletions

diff --git a/src/pbe/pbes2/pbes2.cpp b/src/pbe/pbes2/pbes2.cpp
index 25be6f98a..3935bd702 100644
--- a/src/pbe/pbes2/pbes2.cpp
+++ b/src/pbe/pbes2/pbes2.cpp
@@ -176,7 +176,7 @@ void PBE_PKCS5v20::decode_params(DataSource& source)
    BER_Decoder(enc_algo.parameters).decode(iv, OCTET_STRING).verify_end();
 
    block_cipher = af.make_block_cipher(cipher_spec[0]);
-   hash_function = af.make_hash_function(SCAN_Name("SHA-160"));
+   hash_function = af.make_hash_function("SHA-160");
 
    if(key_length == 0)
       key_length = block_cipher->MAXIMUM_KEYLENGTH;