aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/algo_base
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 22:07:57 +0000
committerlloyd <[email protected]>2014-01-18 22:07:57 +0000
commit97da227cbde0257f14b7cde001680bc69cf941c9 (patch)
treeafe16b54a0192835f3d6284516df1747fbd10954 /src/lib/algo_base
parentb3bffeff3553f4b609afe634c8c8b56ca0a2384c (diff)
Rename the various pubkey padding schemes to match the common names.
Way back when, following IEEE 1363 naming seemed like a good idea. But not so much.
Diffstat (limited to 'src/lib/algo_base')
-rw-r--r--src/lib/algo_base/scan_name.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/lib/algo_base/scan_name.cpp b/src/lib/algo_base/scan_name.cpp
index 84a5e24b4..d32c36a66 100644
--- a/src/lib/algo_base/scan_name.cpp
+++ b/src/lib/algo_base/scan_name.cpp
@@ -206,13 +206,20 @@ void SCAN_Name::set_default_aliases()
SCAN_Name::add_alias("ARC4", "RC4");
SCAN_Name::add_alias("OMAC", "CMAC");
+ SCAN_Name::add_alias("EMSA-PSS", "PSSR");
+ SCAN_Name::add_alias("PSS-MGF1", "PSSR");
+ SCAN_Name::add_alias("EME-OAEP", "OAEP");
+
+ SCAN_Name::add_alias("EMSA2", "EMSA_X931");
+ SCAN_Name::add_alias("EMSA3", "EMSA_PKCS1");
+ SCAN_Name::add_alias("EMSA-PKCS1-v1_5", "EMSA_PKCS1");
+
// should be renamed in sources
- SCAN_Name::add_alias("OAEP-MGF1", "EME1");
- SCAN_Name::add_alias("EME-OAEP", "EME1");
SCAN_Name::add_alias("X9.31", "EMSA2");
- SCAN_Name::add_alias("EMSA-PKCS1-v1_5", "EMSA3");
- SCAN_Name::add_alias("PSS-MGF1", "EMSA4");
- SCAN_Name::add_alias("EMSA-PSS", "EMSA4");
+
+ // kept for compatability with old library versions
+ SCAN_Name::add_alias("EMSA4", "PSSR");
+ SCAN_Name::add_alias("EME1", "OAEP");
// probably can be removed
SCAN_Name::add_alias("GOST", "GOST-28147-89");