Don't call get_eme or get_kdf with name "Raw" (returns NULL); ideally

would like to replace these functions with generic engine code instead
of hardcoded lookup, and NULL return value would be impossible to
disambiguate.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/pubkey/pubkey.cpp b/src/pubkey/pubkey.cpp
index 1d5d8542c..c8ffccf53 100644
--- a/src/pubkey/pubkey.cpp
+++ b/src/pubkey/pubkey.cpp
@@ -37,7 +37,7 @@ PK_Encryptor_EME::PK_Encryptor_EME(const Public_Key& key,
       throw Lookup_Error("PK_Encryptor_EME: No working engine for " +
                          key.algo_name());
 
-   eme = get_eme(eme_name);
+   eme = (eme_name == "Raw") ? 0 : get_eme(eme_name);
    }
 
 /*
@@ -90,7 +90,7 @@ PK_Decryptor_EME::PK_Decryptor_EME(const Private_Key& key,
       throw Lookup_Error("PK_Decryptor_EME: No working engine for " +
                          key.algo_name());
 
-   eme = get_eme(eme_name);
+   eme = (eme_name == "Raw") ? 0 : get_eme(eme_name);
    }
 
 /*
@@ -360,7 +360,7 @@ PK_Key_Agreement::PK_Key_Agreement(const PK_Key_Agreement_Key& key,
       throw Lookup_Error("PK_Key_Agreement: No working engine for " +
                          key.algo_name());
 
-   kdf = get_kdf(kdf_name);
+   kdf = (kdf_name == "Raw") ? 0 : get_kdf(kdf_name);
    }
 
 SymmetricKey PK_Key_Agreement::derive_key(u32bit key_len, const byte in[],