diff options
| author | Adam Langley <agl@google.com> | 2016-07-12 18:03:59 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-07-12 18:05:38 +0300 |
| commit | d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e (patch) | |
| tree | 63062f50f629f12ec8a9aab1ea18c894e6c0303a /include/openssl/pkcs8.h | |
| parent | a125f048c266d8630bc558c3c1315d4fe72664b2 (diff) | |
Revert scoped_types.h change.
This reverts commits:
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
19fdcb523402ed13ab798cf811fb0119e3e7b104
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
Because WebRTC (at least) includes our headers in an extern "C" block,
which precludes having any C++ in them.
Change-Id: Ia849f43795a40034cbd45b22ea680b51aab28b2d
Diffstat (limited to 'include/openssl/pkcs8.h')
| -rw-r--r-- | include/openssl/pkcs8.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/openssl/pkcs8.h b/include/openssl/pkcs8.h index 87d1e053..28cf6ac1 100644 --- a/include/openssl/pkcs8.h +++ b/include/openssl/pkcs8.h @@ -187,19 +187,6 @@ OPENSSL_EXPORT void PKCS12_free(PKCS12 *p12); #if defined(__cplusplus) } /* extern C */ - -#if defined(BORINGSSL_HAVE_CXX11) - -namespace bssl { - -using ScopedPKCS8_PRIV_KEY_INFO = - ScopedType<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>; -using ScopedPKCS12 = ScopedType<PKCS12, PKCS12_free>; - -} // namespace bssl - -#endif - #endif #define PKCS8_R_BAD_PKCS12_DATA 100 |