Merge b427121979 into 44ef69cffb

Corrected Blowfish CBC OID number, fixes issue #25289
2025-07-28 17:51:45 +08:00 · 2025-04-15 11:13:02 -04:00 · 2025-04-15 08:50:55 -04:00 · 2025-04-10 08:17:33 -04:00 · 2025-04-03 13:08:32 -04:00
4 changed files with 11 additions and 2 deletions
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@ -1,3 +1,5 @@
+WARNING: Duplicate short name "BF-CBC"
+WARNING: Duplicate long name "bf-cbc"
 /*
 * WARNING: do not edit!
 * Generated by crypto/objects/obj_dat.pl
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@ -468,8 +468,9 @@ ms-corp 21 10	: ms-app-policies	: Microsoft Application Policies Extension
 !Cname idea-ofb64
 			: IDEA-OFB		: idea-ofb

-1 3 6 1 4 1 3029 1 2	: BF-CBC		: bf-cbc
+1 3 6 1 4 1 3029 1 1 2	: BF-CBC		: bf-cbc
 			: BF-ECB		: bf-ecb
+!Alias bf-cbc 1 3 6 1 4 1 3029 1 2
 !Cname bf-cfb64
 			: BF-CFB		: bf-cfb
 !Cname bf-ofb64
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@ -1432,6 +1432,11 @@
 #define LN_bf_ecb               "bf-ecb"
 #define NID_bf_ecb              92

+#define SN_bf_cbc               "BF-CBC"
+#define LN_bf_cbc               "bf-cbc"
+#define NID_bf_cbc              91
+#define OBJ_bf_cbc              1L,3L,6L,1L,4L,1L,3029L,1L,2L
+
 #define SN_bf_cfb64             "BF-CFB"
 #define LN_bf_cfb64             "bf-cfb"
 #define NID_bf_cfb64            93
--- a/providers/implementations/include/prov/names.h
+++ b/providers/implementations/include/prov/names.h
@ -180,7 +180,8 @@
 #define PROV_NAMES_CAST5_OFB "CAST5-OFB"
 #define PROV_NAMES_CAST5_CFB "CAST5-CFB"
 #define PROV_NAMES_BF_ECB "BF-ECB"
-#define PROV_NAMES_BF_CBC "BF-CBC:BF:BLOWFISH:1.3.6.1.4.1.3029.1.2"
+/* For compatibility reasons, Blowfish has a second, outdated OID.  */
+#define PROV_NAMES_BF_CBC "BF-CBC:BF:BLOWFISH:1.3.6.1.4.1.3029.1.1.2:1.3.6.1.4.1.3029.1.2"
 #define PROV_NAMES_BF_OFB "BF-OFB"
 #define PROV_NAMES_BF_CFB "BF-CFB"
 #define PROV_NAMES_IDEA_ECB "IDEA-ECB"
Author	SHA1	Message	Date
sammillman	29a2806115	Merge `b427121979` into `44ef69cffb`	2025-07-28 17:51:45 +08:00
Sam Millman	b427121979	Corrected Blowfish CBC OID number, fixes issue #25289	2025-04-15 11:13:02 -04:00
Sam Millman	fe6b868732	Corrected Blowfish CBC OID number, fixes issue #25289	2025-04-15 08:50:55 -04:00
Sam Millman	47b8db6d44	Corrected Blowfish CBC OID number, fixes issue openssl#25289	2025-04-10 08:17:33 -04:00
Sam Millman	87b30f9188	Corrected Blowfish CBC OID number, fixes issue #25289	2025-04-03 13:08:32 -04:00