j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added encoded OID for hash functions (for use with PKCS#1 v1.5 signatures) into the public API.

Browse source
This commit is contained in:
Thomas Pornin 2017-06-21 15:19:32 +02:00
parent 81437e1175
commit 7f343eedfc
3 changed files with 40 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

30
inc/bearssl_rsa.h
View file

@ -332,6 +332,36 @@ typedef uint32_t (*br_rsa_pkcs1_sign)(const unsigned char *hash_oid,
const unsigned char *hash, size_t hash_len, const unsigned char *hash, size_t hash_len,
const br_rsa_private_key *sk, unsigned char *x); const br_rsa_private_key *sk, unsigned char *x);
/**
* \brief Encoded OID for SHA-1 (in RSA PKCS#1 signatures).
*/
#define BR_HASH_OID_SHA1 \
((const unsigned char *)"\x05\x2B\x0E\x03\x02\x1A")
/**
* \brief Encoded OID for SHA-224 (in RSA PKCS#1 signatures).
*/
#define BR_HASH_OID_SHA224 \
((const unsigned char *)"\x09\x60\x86\x48\x01\x65\x03\x04\x02\x04")
/**
* \brief Encoded OID for SHA-256 (in RSA PKCS#1 signatures).
*/
#define BR_HASH_OID_SHA256 \
((const unsigned char *)"\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01")
/**
* \brief Encoded OID for SHA-384 (in RSA PKCS#1 signatures).
*/
#define BR_HASH_OID_SHA384 \
((const unsigned char *)"\x09\x60\x86\x48\x01\x65\x03\x04\x02\x02")
/**
* \brief Encoded OID for SHA-512 (in RSA PKCS#1 signatures).
*/
#define BR_HASH_OID_SHA512 \
((const unsigned char *)"\x09\x60\x86\x48\x01\x65\x03\x04\x02\x03")
/* /*
* RSA "i32" engine. Integers are internally represented as arrays of * RSA "i32" engine. Integers are internally represented as arrays of
* 32-bit integers, and the core multiplication primitive is the * 32-bit integers, and the core multiplication primitive is the

30
src/ssl/ssl_hs_client.c
View file

@ -170,32 +170,12 @@ make_pms_rsa(br_ssl_client_context *ctx, int prf_id)
/* /*
* OID for hash functions in RSA signatures. * OID for hash functions in RSA signatures.
*/ */
static const unsigned char HASH_OID_SHA1[] = {
0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A
};
static const unsigned char HASH_OID_SHA224[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04
};
static const unsigned char HASH_OID_SHA256[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01
};
static const unsigned char HASH_OID_SHA384[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02
};
static const unsigned char HASH_OID_SHA512[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03
};
static const unsigned char *HASH_OID[] = { static const unsigned char *HASH_OID[] = {
HASH_OID_SHA1, BR_HASH_OID_SHA1,
HASH_OID_SHA224, BR_HASH_OID_SHA224,
HASH_OID_SHA256, BR_HASH_OID_SHA256,
HASH_OID_SHA384, BR_HASH_OID_SHA384,
HASH_OID_SHA512 BR_HASH_OID_SHA512
}; };
/* /*

30
src/ssl/ssl_hs_client.t0
View file

@ -115,32 +115,12 @@ make_pms_rsa(br_ssl_client_context *ctx, int prf_id)
/* /*
* OID for hash functions in RSA signatures. * OID for hash functions in RSA signatures.
*/ */
static const unsigned char HASH_OID_SHA1[] = {
0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A
};
static const unsigned char HASH_OID_SHA224[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04
};
static const unsigned char HASH_OID_SHA256[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01
};
static const unsigned char HASH_OID_SHA384[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02
};
static const unsigned char HASH_OID_SHA512[] = {
0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03
};
static const unsigned char *HASH_OID[] = { static const unsigned char *HASH_OID[] = {
HASH_OID_SHA1, BR_HASH_OID_SHA1,
HASH_OID_SHA224, BR_HASH_OID_SHA224,
HASH_OID_SHA256, BR_HASH_OID_SHA256,
HASH_OID_SHA384, BR_HASH_OID_SHA384,
HASH_OID_SHA512 BR_HASH_OID_SHA512
}; };
/* /*