Fix for CVE-2014-3570 (with minor bn_asm.c revamp).

[oweals/openssl.git] / crypto / objects / obj_mac.h

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 71590387eda4da6bcac96f6099c3b6b81290e38c..0ce54a8f7212c7e1e91934a1581d78f2b94b9546 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -2745,6 +2745,18 @@
 #define LN_aes_256_ctr         "aes-256-ctr"
 #define NID_aes_256_ctr                906
 
+#define SN_aes_128_ocb         "AES-128-OCB"
+#define LN_aes_128_ocb         "aes-128-ocb"
+#define NID_aes_128_ocb                958
+
+#define SN_aes_192_ocb         "AES-192-OCB"
+#define LN_aes_192_ocb         "aes-192-ocb"
+#define NID_aes_192_ocb                959
+
+#define SN_aes_256_ocb         "AES-256-OCB"
+#define LN_aes_256_ocb         "aes-256-ocb"
+#define NID_aes_256_ocb                960
+
 #define SN_aes_128_xts         "AES-128-XTS"
 #define LN_aes_128_xts         "aes-128-xts"
 #define NID_aes_128_xts                913
@@ -4178,3 +4190,18 @@
 #define NID_ct_cert_scts               954
 #define OBJ_ct_cert_scts               1L,3L,6L,1L,4L,1L,11129L,2L,4L,5L
 
+#define SN_jurisdictionLocalityName            "jurisdictionL"
+#define LN_jurisdictionLocalityName            "jurisdictionLocalityName"
+#define NID_jurisdictionLocalityName           955
+#define OBJ_jurisdictionLocalityName           1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,1L
+
+#define SN_jurisdictionStateOrProvinceName             "jurisdictionST"
+#define LN_jurisdictionStateOrProvinceName             "jurisdictionStateOrProvinceName"
+#define NID_jurisdictionStateOrProvinceName            956
+#define OBJ_jurisdictionStateOrProvinceName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,2L
+
+#define SN_jurisdictionCountryName             "jurisdictionC"
+#define LN_jurisdictionCountryName             "jurisdictionCountryName"
+#define NID_jurisdictionCountryName            957
+#define OBJ_jurisdictionCountryName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,3L
+