| commit | f0c4a6c4bbde5229ceb86740703243fe5c436aad | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@google.com> | Thu Aug 11 13:26:41 2016 -0400 |
| committer | David Benjamin <davidben@google.com> | Mon Sep 12 13:10:03 2016 -0400 |
| tree | f55d7d9db657ca3a8a09c2ae5017a40ad92b15cb | |
| parent | c501d144b4305c228a0aaa8b3e291510e3b1235b [diff] [blame] |
external/boringssl: Sync to 0e9138d2. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/aa24851515d6280aa1d6a8b1548fe74691df3136..0e9138d295cd556e830dc8b3be735e808680f4bd This requires some build tweaks: - trusty's rules.mk builds with BORINGSSL_NO_CXX to suppress the new C++ scopers since they build their version of keymaster without the STL. - BORINGSSL_ENABLE_RC4_TLS to temporarily keep RC4 in the TLS stack. Change-Id: Ic688ec5779f649a4912b00fb2b55cba64fb07449
diff --git a/src/include/openssl/pkcs8.h b/src/include/openssl/pkcs8.h index 28cf6ac..e04a4f3 100644 --- a/src/include/openssl/pkcs8.h +++ b/src/include/openssl/pkcs8.h
@@ -187,6 +187,18 @@ #if defined(__cplusplus) } /* extern C */ + +extern "C++" { + +namespace bssl { + +BORINGSSL_MAKE_DELETER(PKCS12, PKCS12_free) +BORINGSSL_MAKE_DELETER(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free) + +} // namespace bssl + +} /* extern C++ */ + #endif #define PKCS8_R_BAD_PKCS12_DATA 100