src: remove internal includes from node_crypto.h · nodejs/node@f65cb75 (original) (raw)

5 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -3,10 +3,12 @@
3 3 #include "inspector_socket_server.h"
4 4 #include "inspector/main_thread_interface.h"
5 5 #include "inspector/node_string.h"
6 +#include "base_object-inl.h"
6 7 #include "env-inl.h"
7 8 #include "debug_utils.h"
8 9 #include "node.h"
9 10 #include "node_crypto.h"
11 +#include "node_internals.h"
10 12 #include "node_mutex.h"
11 13 #include "v8-inspector.h"
12 14 #include "util.h"
Original file line number Diff line number Diff line change
@@ -20,9 +20,7 @@
20 20 // USE OR OTHER DEALINGS IN THE SOFTWARE.
21 21
22 22 #include "node_crypto.h"
23 -#include "node.h"
24 23 #include "node_buffer.h"
25 -#include "node_constants.h"
26 24 #include "node_crypto_bio.h"
27 25 #include "node_crypto_clienthello-inl.h"
28 26 #include "node_crypto_groups.h"
@@ -32,11 +30,24 @@
32 30 #include "tls_wrap.h" // TLSWrap
33 31
34 32 #include "async_wrap-inl.h"
33 +#include "base_object-inl.h"
35 34 #include "env-inl.h"
36 35 #include "string_bytes.h"
37 36 #include "util-inl.h"
38 37 #include "v8.h"
39 38
39 +#include <openssl/ec.h>
40 +#include <openssl/ecdh.h>
41 +#ifndef OPENSSL_NO_ENGINE
42 +# include <openssl/engine.h>
43 +#endif // !OPENSSL_NO_ENGINE
44 +#include <openssl/evp.h>
45 +#include <openssl/pem.h>
46 +#include <openssl/x509v3.h>
47 +#include <openssl/hmac.h>
48 +#include <openssl/rand.h>
49 +#include <openssl/pkcs12.h>
50 +
40 51 #include <cerrno>
41 52 #include <climits> // INT_MAX
42 53 #include <cstring>
Original file line number Diff line number Diff line change
@@ -24,34 +24,17 @@
24 24
25 25 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
26 26
27 -#include "node.h"
28 27 // ClientHelloParser
29 28 #include "node_crypto_clienthello.h"
30 29
31 -#include "node_buffer.h"
32 -
33 30 #include "env.h"
34 -#include "async_wrap-inl.h"
35 -#include "base_object-inl.h"
31 +#include "base_object.h"
32 +#include "util.h"
36 33
37 34 #include "v8.h"
38 35
39 -#include <openssl/ssl.h>
40 -#include <openssl/ec.h>
41 -#include <openssl/ecdh.h>
42 -#ifndef OPENSSL_NO_ENGINE
43 -# include <openssl/engine.h>
44 -#endif // !OPENSSL_NO_ENGINE
45 36 #include <openssl/err.h>
46 -#include <openssl/evp.h>
47 -// TODO(shigeki) Remove this after upgrading to 1.1.1
48 -#include <openssl/obj_mac.h>
49 -#include <openssl/pem.h>
50 -#include <openssl/x509.h>
51 -#include <openssl/x509v3.h>
52 -#include <openssl/hmac.h>
53 -#include <openssl/rand.h>
54 -#include <openssl/pkcs12.h>
37 +#include <openssl/ssl.h>
55 38
56 39 namespace node {
57 40 namespace crypto {
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
19 19 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20 20 // USE OR OTHER DEALINGS IN THE SOFTWARE.
21 21
22 +#include "base_object-inl.h"
22 23 #include "node_crypto_bio.h"
23 24 #include "openssl/bio.h"
24 25 #include "util-inl.h"
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@
24 24
25 25 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
26 26
27 -#include "node.h"
28 27 #include "node_crypto.h" // SSLWrap
29 28
30 29 #include "async_wrap.h"