Skip to content
Permalink
Browse files

vender, feat: update mbedtls to v2.16.2.

  • Loading branch information...
xicilion committed Aug 29, 2019
1 parent 330d1d0 commit a0b4af9069f0a910672d5081bad727c85709dd7c
Showing with 9 additions and 9 deletions.
  1. +2 −2 fibjs/src/crypto/PKey.cpp
  2. +6 −6 test/crypto_test.js
  3. +1 −1 vender
@@ -311,12 +311,12 @@ result_t PKey::importKey(Buffer_base* DerKey, exlib::string password)

clear();

ret = mbedtls_pk_parse_key(&m_key, (unsigned char*)key.c_str(), key.length() + 1,
ret = mbedtls_pk_parse_key(&m_key, (unsigned char*)key.c_str(), key.length(),
!password.empty() ? (unsigned char*)password.c_str() : NULL,
password.length());

if (ret == MBEDTLS_ERR_PK_KEY_INVALID_FORMAT)
ret = mbedtls_pk_parse_public_key(&m_key, (unsigned char*)key.c_str(), key.length() + 1);
ret = mbedtls_pk_parse_public_key(&m_key, (unsigned char*)key.c_str(), key.length());

if (ret != 0)
return CHECK_ERROR(_ssl::setError(ret));
@@ -101,15 +101,15 @@ var pk = "-----BEGIN PUBLIC KEY-----\n" +
"-----END PUBLIC KEY-----\n";

var req1 = "-----BEGIN CERTIFICATE REQUEST-----\n" +
"MIIBcDCB2gIBADAxMQswCQYDVQQGEwJDTjEQMA4GA1UEChMHYmFvei5jbjEQMA4G\n" +
"A1UEAxMHYmFvei5tZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0m5lvKpW\n" +
"MIIBcDCB2gIBADAxMQswCQYDVQQGEwJDTjEQMA4GA1UECgwHYmFvei5jbjEQMA4G\n" +
"A1UEAwwHYmFvei5tZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0m5lvKpW\n" +
"qy9JS7tV2HIPqHCYHLquSuxIC3F8strIQLJKO3rZmTT96KTnhsOfBO7Y1bI7mnT0\n" +
"PB3/vcHd9ekWMEoZJQw7MuB8KeM/Wn54+elJr5DNLk5bMppSGxX7ZnumiXGG51/X\n" +
"3Yp+/EbGtDG80GxXXix7Mucyo7K25uE0uW8CAwEAAaAAMA0GCSqGSIb3DQEBBQUA\n" +
"A4GBACx6pUvyyU3YmwR42MjRT9q2cN5KVt5oWCdSgOC+WTNi4FeMRCxPC8ExNkzN\n" +
"mn71AolBNc1ve5cgyr3CGN3mYK86heH2y0x4xApN/IJeUCdAtzMFvLbvkEBSLtkz\n" +
"G3f1zTP01fknEN1WH762dXrisQONk6qmbga6ytMo7KbJ0Xgl\n" +
"-----END CERTIFICATE REQUEST-----\n";
"A4GBALyElVlapPjcP7YlIA38kUWEDmuwGSaqJBetD28QMBF6VHIYggf2aIcjJTCp\n" +
"FptoY0mh3ZiU8W96cvMo9Vp/cqqBPklxcppVSIHSUHWGFAjddLVQoGOXNmWTtOzY\n" +
"DN21j9j2/Ooygoh64ReClWyzwirSVbscelMjpSpE1FvT0HeR\n" +
"-----END CERTIFICATE REQUEST-----\n"

var rsa_pub_key = "-----BEGIN RSA PUBLIC KEY-----\n" +
"MIIBCgKCAQEAniqcAxl7LclB0kE6q9AcAd8EE+0W6AsriR9Fs9T+6QVXl8uiCiAb\n" +
2 vender
Submodule vender updated 162 files

0 comments on commit a0b4af9

Please sign in to comment.
You can’t perform that action at this time.