Fold stack-allocated types into headers.
Now that we have the extern "C++" trick, we can just embed them in the
normal headers. Move the EVP_CIPHER_CTX deleter to cipher.h and, in
doing so, take away a little bit of boilerplate in defining deleters.
Change-Id: I4a4b8d0db5274a3607914d94e76a38996bd611ec
Reviewed-on: https://boringssl-review.googlesource.com/10804
Reviewed-by: Matt Braithwaite <mab@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/bytestring/bytestring_test.cc b/crypto/bytestring/bytestring_test.cc
index 45a2335..251aa37 100644
--- a/crypto/bytestring/bytestring_test.cc
+++ b/crypto/bytestring/bytestring_test.cc
@@ -22,7 +22,7 @@
#include <vector>
-#include <openssl/c++/bytestring.h>
+#include <openssl/bytestring.h>
#include <openssl/crypto.h>
#include "internal.h"
diff --git a/crypto/cipher/aead_test.cc b/crypto/cipher/aead_test.cc
index b75737f..38a07d3 100644
--- a/crypto/cipher/aead_test.cc
+++ b/crypto/cipher/aead_test.cc
@@ -17,7 +17,7 @@
#include <vector>
-#include <openssl/c++/aead.h>
+#include <openssl/aead.h>
#include <openssl/crypto.h>
#include <openssl/err.h>
diff --git a/crypto/cipher/cipher_test.cc b/crypto/cipher/cipher_test.cc
index 08c8bd5..cb42fc5 100644
--- a/crypto/cipher/cipher_test.cc
+++ b/crypto/cipher/cipher_test.cc
@@ -57,7 +57,7 @@
#include <string>
#include <vector>
-#include <openssl/c++/cipher.h>
+#include <openssl/cipher.h>
#include <openssl/crypto.h>
#include <openssl/err.h>
diff --git a/crypto/dh/dh_test.cc b/crypto/dh/dh_test.cc
index 12984e6..9a3d780 100644
--- a/crypto/dh/dh_test.cc
+++ b/crypto/dh/dh_test.cc
@@ -62,7 +62,7 @@
#include <vector>
#include <openssl/bn.h>
-#include <openssl/c++/bytestring.h>
+#include <openssl/bytestring.h>
#include <openssl/crypto.h>
#include <openssl/dh.h>
#include <openssl/err.h>
diff --git a/crypto/digest/digest_test.cc b/crypto/digest/digest_test.cc
index 585b62a..70fa483 100644
--- a/crypto/digest/digest_test.cc
+++ b/crypto/digest/digest_test.cc
@@ -18,8 +18,8 @@
#include <memory>
-#include <openssl/c++/digest.h>
#include <openssl/crypto.h>
+#include <openssl/digest.h>
#include <openssl/err.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
diff --git a/crypto/ec/ec_test.cc b/crypto/ec/ec_test.cc
index 9648d57..839acfe 100644
--- a/crypto/ec/ec_test.cc
+++ b/crypto/ec/ec_test.cc
@@ -17,8 +17,8 @@
#include <vector>
-#include <openssl/c++/bytestring.h>
#include <openssl/bn.h>
+#include <openssl/bytestring.h>
#include <openssl/crypto.h>
#include <openssl/ec_key.h>
#include <openssl/err.h>
diff --git a/crypto/evp/evp_extra_test.cc b/crypto/evp/evp_extra_test.cc
index 125dc03..755fa83 100644
--- a/crypto/evp/evp_extra_test.cc
+++ b/crypto/evp/evp_extra_test.cc
@@ -20,9 +20,9 @@
#include <utility>
#include <vector>
-#include <openssl/c++/bytestring.h>
-#include <openssl/c++/digest.h>
+#include <openssl/bytestring.h>
#include <openssl/crypto.h>
+#include <openssl/digest.h>
#include <openssl/err.h>
#include <openssl/pkcs8.h>
#include <openssl/rsa.h>
diff --git a/crypto/evp/evp_test.cc b/crypto/evp/evp_test.cc
index 58d3ebd..68b869a 100644
--- a/crypto/evp/evp_test.cc
+++ b/crypto/evp/evp_test.cc
@@ -68,7 +68,7 @@
OPENSSL_MSVC_PRAGMA(warning(pop))
-#include <openssl/c++/bytestring.h>
+#include <openssl/bytestring.h>
#include <openssl/crypto.h>
#include <openssl/digest.h>
#include <openssl/err.h>
diff --git a/crypto/hmac/hmac_test.cc b/crypto/hmac/hmac_test.cc
index 3d49d9e..60a9581 100644
--- a/crypto/hmac/hmac_test.cc
+++ b/crypto/hmac/hmac_test.cc
@@ -61,9 +61,9 @@
#include <string>
#include <vector>
-#include <openssl/c++/hmac.h>
#include <openssl/crypto.h>
#include <openssl/digest.h>
+#include <openssl/hmac.h>
#include "../test/file_test.h"
diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
index 3c7cc63..a62088d 100644
--- a/crypto/x509/x509_test.cc
+++ b/crypto/x509/x509_test.cc
@@ -17,8 +17,8 @@
#include <assert.h>
#include <string.h>
-#include <openssl/c++/digest.h>
#include <openssl/crypto.h>
+#include <openssl/digest.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
