summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c3a261f)
Signed-off-by: Antoine Salon <asalon@vmware.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7726)
void openssl_add_all_macs_int(void)
{
void openssl_add_all_macs_int(void)
{
+#ifndef OPENSSL_NO_BLAKE2
+ EVP_add_mac(&blake2b_mac_meth);
+#endif
#ifndef OPENSSL_NO_CMAC
EVP_add_mac(&cmac_meth);
#endif
#ifndef OPENSSL_NO_CMAC
EVP_add_mac(&cmac_meth);
#endif
0x28,0xCC,0x45,0x03,0x04, /* [ 7761] OBJ_gmac */
};
0x28,0xCC,0x45,0x03,0x04, /* [ 7761] OBJ_gmac */
};
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
{"AES-128-SIV", "aes-128-siv", NID_aes_128_siv},
{"AES-192-SIV", "aes-192-siv", NID_aes_192_siv},
{"AES-256-SIV", "aes-256-siv", NID_aes_256_siv},
{"AES-128-SIV", "aes-128-siv", NID_aes_128_siv},
{"AES-192-SIV", "aes-192-siv", NID_aes_192_siv},
{"AES-256-SIV", "aes-256-siv", NID_aes_256_siv},
+ {"BLAKE2BMAC", "blake2bmac", NID_blake2bmac},
+ {"BLAKE2SMAC", "blake2smac", NID_blake2smac},
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
93, /* "BF-CFB" */
92, /* "BF-ECB" */
94, /* "BF-OFB" */
93, /* "BF-CFB" */
92, /* "BF-ECB" */
94, /* "BF-OFB" */
+ 1201, /* "BLAKE2BMAC" */
+ 1202, /* "BLAKE2SMAC" */
1056, /* "BLAKE2b512" */
1057, /* "BLAKE2s256" */
14, /* "C" */
1056, /* "BLAKE2b512" */
1057, /* "BLAKE2s256" */
14, /* "C" */
1093, /* "x509ExtAdmission" */
};
1093, /* "x509ExtAdmission" */
};
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
92, /* "bf-ecb" */
94, /* "bf-ofb" */
1056, /* "blake2b512" */
92, /* "bf-ecb" */
94, /* "bf-ofb" */
1056, /* "blake2b512" */
+ 1201, /* "blake2bmac" */
+ 1202, /* "blake2smac" */
921, /* "brainpoolP160r1" */
922, /* "brainpoolP160t1" */
923, /* "brainpoolP192r1" */
921, /* "brainpoolP160r1" */
922, /* "brainpoolP160t1" */
923, /* "brainpoolP192r1" */
aes_128_siv 1198
aes_192_siv 1199
aes_256_siv 1200
aes_128_siv 1198
aes_192_siv 1199
aes_256_siv 1200
+blake2bmac 1201
+blake2smac 1202
# There are no OIDs for these yet...
: KMAC128 : kmac128
: KMAC256 : kmac256
# There are no OIDs for these yet...
: KMAC128 : kmac128
: KMAC256 : kmac256
+ : BLAKE2BMAC : blake2bmac
+ : BLAKE2SMAC : blake2smac
# HMAC OIDs
identified-organization 6 1 5 5 8 1 1 : HMAC-MD5 : hmac-md5
# HMAC OIDs
identified-organization 6 1 5 5 8 1 1 : HMAC-MD5 : hmac-md5
+# define EVP_MAC_BLAKE2B NID_blake2bmac
+# define EVP_MAC_BLAKE2S NID_blake2smac
# define EVP_MAC_CMAC NID_cmac
# define EVP_MAC_GMAC NID_gmac
# define EVP_MAC_HMAC NID_hmac
# define EVP_MAC_CMAC NID_cmac
# define EVP_MAC_GMAC NID_gmac
# define EVP_MAC_HMAC NID_hmac
#define LN_kmac256 "kmac256"
#define NID_kmac256 1197
#define LN_kmac256 "kmac256"
#define NID_kmac256 1197
+#define SN_blake2bmac "BLAKE2BMAC"
+#define LN_blake2bmac "blake2bmac"
+#define NID_blake2bmac 1201
+
+#define SN_blake2smac "BLAKE2SMAC"
+#define LN_blake2smac "blake2smac"
+#define NID_blake2smac 1202
+
#define SN_hmac_md5 "HMAC-MD5"
#define LN_hmac_md5 "hmac-md5"
#define NID_hmac_md5 780
#define SN_hmac_md5 "HMAC-MD5"
#define LN_hmac_md5 "hmac-md5"
#define NID_hmac_md5 780