Fix building with node 10.0.0

.travis.yml

@@ -11,6 +11,9 @@ addons:
 language: node_js
 node_js:
   - "stable"
+  - "9.0"
+  - "8.0"
+  - "6.0"
   - "4.0"
   - "0.12"
   - "0.10"

include/x509.h

@@ -3,19 +3,20 @@
 
 // Include header for addon version, node/v8 inclusions, etc.
 #include <addon.h>
-#include <node_version.h>
 #include <nan.h>
+#include <node_version.h>
 #include <string>
 
 // OpenSSL headers
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
+#include <openssl/bn.h>
 #include <openssl/err.h>
+#include <openssl/opensslv.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 #include <openssl/x509_vfy.h>
-#include <openssl/bn.h>
+#include <openssl/x509v3.h>
 
 using namespace v8;
 
@@ -25,13 +26,13 @@ NAN_METHOD(get_issuer);
 NAN_METHOD(parse_cert);
 NAN_METHOD(verify);
 
-Local<Value> try_parse(const std::string& dataString);
-Local<Value> verify(const std::string& dataString);
+Local<Value> try_parse(const std::string &dataString);
+Local<Value> verify(const std::string &dataString);
 Local<Value> parse_date(ASN1_TIME *date);
 Local<Value> parse_serial(ASN1_INTEGER *serial);
 Local<Object> parse_name(X509_NAME *subject);
 
-char* real_name(char *data);
-char* trim(char *data, int len);
+char *real_name(char *data);
+char *trim(char *data, int len);
 
 #endif

package.json

@@ -13,6 +13,6 @@
   },
   "license": "MIT",
   "dependencies": {
-    "nan": "2.2.0"
+    "nan": "2.10.0"
   }
 }

src/addon.cc

@@ -1,32 +1,26 @@
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 
 #include <addon.h>
 #include <x509.h>
 
 using namespace v8;
 
 void init(Local<Object> exports) {
-  Nan::Set(exports,
-    Nan::New<String>("version").ToLocalChecked(),
-    Nan::New<String>(VERSION).ToLocalChecked());
+    Nan::Set(exports, Nan::New<String>("version").ToLocalChecked(),
+             Nan::New<String>(VERSION).ToLocalChecked());
 
-  Nan::Set(exports,
-    Nan::New<String>("verify").ToLocalChecked(),
-    Nan::New<FunctionTemplate>(verify)->GetFunction());
+    Nan::Set(exports, Nan::New<String>("verify").ToLocalChecked(),
+             Nan::New<FunctionTemplate>(verify)->GetFunction());
 
-  Nan::Set(exports,
-    Nan::New<String>("getAltNames").ToLocalChecked(),
-    Nan::New<FunctionTemplate>(get_altnames)->GetFunction());
-  Nan::Set(exports,
-    Nan::New<String>("getSubject").ToLocalChecked(),
-    Nan::New<FunctionTemplate>(get_subject)->GetFunction());
-  Nan::Set(exports,
-    Nan::New<String>("getIssuer").ToLocalChecked(),
-    Nan::New<FunctionTemplate>(get_issuer)->GetFunction());
-  Nan::Set(exports,
-    Nan::New<String>("parseCert").ToLocalChecked(),
-    Nan::New<FunctionTemplate>(parse_cert)->GetFunction());
+    Nan::Set(exports, Nan::New<String>("getAltNames").ToLocalChecked(),
+             Nan::New<FunctionTemplate>(get_altnames)->GetFunction());
+    Nan::Set(exports, Nan::New<String>("getSubject").ToLocalChecked(),
+             Nan::New<FunctionTemplate>(get_subject)->GetFunction());
+    Nan::Set(exports, Nan::New<String>("getIssuer").ToLocalChecked(),
+             Nan::New<FunctionTemplate>(get_issuer)->GetFunction());
+    Nan::Set(exports, Nan::New<String>("parseCert").ToLocalChecked(),
+             Nan::New<FunctionTemplate>(parse_cert)->GetFunction());
 }
 
 NODE_MODULE(x509, init)