feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #209 from kaleb-himes/master

Browse Source 
OpenSSH added support for additional NID types. Update our compatibil…
This commit is contained in:
toddouska
2015-12-28 11:52:38 -08:00
parent 92cb8eee61 cbf3213c4f
commit 3a1909dab9
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ssl.c
View File

@ -13310,9 +13310,28 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m,
return 0; return 0;
} }
if (type != NID_md5 && type != NID_sha1) { switch (type) {
WOLFSSL_MSG("Bad md type"); #ifdef WOLFSSL_MD2
return 0; case NID_md2: type = MD2h; break;
#endif
#ifndef NO_MD5
case NID_md5: type = MD5h; break;
#endif
#ifndef NO_SHA
case NID_sha1: type = SHAh; break;
#endif
#ifndef NO_SHA256
case NID_sha256: type = SHA256h; break;
#endif
#ifdef WOLFSSL_SHA384
case NID_sha384: type = SHA384h; break;
#endif
#ifdef WOLFSSL_SHA512
case NID_sha512: type = SHA512h; break;
#endif
default:
WOLFSSL_MSG("This NID (md type) not configured or not implemented");
return 0;
} }
if (rsa->inSet == 0) if (rsa->inSet == 0)
@ -13356,7 +13375,6 @@ int wolfSSL_RSA_sign(int type, const unsigned char* m,
} }
if (rng) { if (rng) {
type = (type == NID_md5) ? MD5h : SHAh;
signSz = wc_EncodeSignature(encodedSig, m, mLen, type); signSz = wc_EncodeSignature(encodedSig, m, mLen, type);
if (signSz == 0) { if (signSz == 0) {

1
wolfssl/openssl/evp.h
View File

@ -132,6 +132,7 @@ enum {
EVP_PKEY_EC = 13, EVP_PKEY_EC = 13,
IDEA_CBC_TYPE = 14, IDEA_CBC_TYPE = 14,
NID_sha1 = 64, NID_sha1 = 64,
NID_md2 = 3,
NID_md5 = 4 NID_md5 = 4
}; };

7
wolfssl/openssl/rsa.h
View File

@ -17,6 +17,13 @@ enum {
RSA_PKCS1_PADDING = 1 RSA_PKCS1_PADDING = 1
}; };
/* rsaTypes */
enum {
NID_sha256 = 672,
NID_sha384 = 673,
NID_sha512 = 674
};
struct WOLFSSL_RSA { struct WOLFSSL_RSA {
WOLFSSL_BIGNUM* n; WOLFSSL_BIGNUM* n;
WOLFSSL_BIGNUM* e; WOLFSSL_BIGNUM* e;