1
1
'use strict' ;
2
2
3
+ var log4js = require ( 'log4js' ) ;
4
+ var logger = log4js . getLogger ( ) ;
5
+ log4js . configure ( {
6
+ appenders : { console : { type : 'console' } } ,
7
+ categories : { default : { appenders : [ 'console' ] , level : 'info' } }
8
+ } ) ;
9
+ console . log = logger . info . bind ( logger ) ;
10
+ logger . level = 'TRACE' ;
11
+
3
12
var spawn = require ( 'child_process' ) . spawn ;
4
13
var pathlib = require ( 'path' ) ;
5
14
var fs = require ( 'fs' ) ;
@@ -813,9 +822,8 @@ function verifySigningChain(certificate, ca, callback) {
813
822
'--TMPFILE--'
814
823
] ;
815
824
816
- spawnWrapper ( params , files , function ( err , code , stdout , stderr ) {
825
+ spawnWrapper ( params , files , function ( err , code , stdout ) {
817
826
if ( err ) {
818
- console . log ( err , stdout , stderr ) ;
819
827
return callback ( err ) ;
820
828
}
821
829
@@ -1064,7 +1072,7 @@ function spawnOpenSSL(params, binary, callback) {
1064
1072
if ( -- needed < 1 ) {
1065
1073
finished = true ;
1066
1074
if ( code ) {
1067
- if ( code === 2 && openSslVersion === "LIBRESSL " ) {
1075
+ if ( code === 2 && stderr === "" ) {
1068
1076
return callback ( null , code , stdout , stderr ) ;
1069
1077
}
1070
1078
return callback ( new Error ( 'Invalid openssl exit code: ' + code + '\n% openssl ' + params . join ( ' ' ) + '\n' + stderr ) , code ) ;
@@ -1199,4 +1207,11 @@ spawnOpenSSL(['version'], false, function(err, code, stdout, stderr) {
1199
1207
openSslVersion = tmp && tmp [ 0 ] ? "LibreSSL" : "openssl" ;
1200
1208
1201
1209
openSslVersion = openSslVersion . toUpperCase ( ) ;
1210
+
1211
+ logger . debug ( openSslVersion ) ;
1212
+ logger . debug ( text ) ;
1213
+ logger . debug ( openSslVersion ) ;
1214
+ logger . debug ( text ) ;
1215
+ logger . debug ( openSslVersion ) ;
1216
+ logger . debug ( text ) ;
1202
1217
} ) ;
0 commit comments