diff options
| author | Robert Sloan <varomodt@google.com> | 2017-03-27 07:13:07 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-03-27 14:04:02 -0700 |
| commit | 6d0d00e090b753250659b9a2d67dab7467257900 (patch) | |
| tree | c478b31bb734b02e26a264d7c1b45e49c5593acc /src/decrepit | |
| parent | 8ecb7cdb5c51e9ce89a04ed0f5285ce646b8b7eb (diff) | |
| download | boringssl-6d0d00e090b753250659b9a2d67dab7467257900.tar.gz | |
external/boringssl: Sync to bbfe603519bc54fbc4c8dd87efe1ed385df550b4.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/2d05568a7b7bc62affbd13ea97a81b5829b99794..bbfe603519bc54fbc4c8dd87efe1ed385df550b4
Test: BoringSSL CTS Presubmits.
Change-Id: I78ec99cd34bebca1f864e4daaaedeec6bc1db3f0
Diffstat (limited to 'src/decrepit')
| -rw-r--r-- | src/decrepit/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/decrepit/rsa/rsa_decrepit.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/decrepit/CMakeLists.txt b/src/decrepit/CMakeLists.txt index 223320d2..a3e409b5 100644 --- a/src/decrepit/CMakeLists.txt +++ b/src/decrepit/CMakeLists.txt @@ -46,4 +46,7 @@ add_executable( ) target_link_libraries(decrepit_test crypto decrepit gtest) +if (WIN32) + target_link_libraries(decrepit_test ws2_32) +endif() add_dependencies(all_tests decrepit_test) diff --git a/src/decrepit/rsa/rsa_decrepit.c b/src/decrepit/rsa/rsa_decrepit.c index 0d7c5f66..c4ef5b66 100644 --- a/src/decrepit/rsa/rsa_decrepit.c +++ b/src/decrepit/rsa/rsa_decrepit.c @@ -95,9 +95,9 @@ int RSA_verify_PKCS1_PSS(RSA *rsa, const uint8_t *mHash, const EVP_MD *Hash, return RSA_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, NULL, EM, sLen); } -int RSA_padding_add_PKCS1_OAEP(uint8_t *to, unsigned to_len, - const uint8_t *from, unsigned from_len, - const uint8_t *param, unsigned param_len) { +int RSA_padding_add_PKCS1_OAEP(uint8_t *to, size_t to_len, + const uint8_t *from, size_t from_len, + const uint8_t *param, size_t param_len) { return RSA_padding_add_PKCS1_OAEP_mgf1(to, to_len, from, from_len, param, param_len, NULL, NULL); } |