moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Fix to skip untrusted certs.

Browse Source
This commit is contained in:
Guenter Knauf 2011-11-08 05:46:46 +01:00
parent c8ffb4049a
commit fd765c627f
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/mk-ca-bundle.vbs
View File

@ -26,7 +26,7 @@
'* Hacked by Guenter Knauf '* Hacked by Guenter Knauf
'*************************************************************************** '***************************************************************************
Option Explicit Option Explicit
Const myVersion = "0.3.5" Const myVersion = "0.3.6"
Const myUrl = "http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1" Const myUrl = "http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1"
@ -96,8 +96,10 @@ If (myAskTiF = TRUE) Then
End If End If
End If End If
' Process the received data ' Process the received data
Dim myLines, myPattern, myInsideCert, myInsideLicense, myLicenseText, myNumCerts Dim myLines, myPattern, myInsideCert, myInsideLicense, myLicenseText, myNumCerts, myNumSkipped
Dim myLabel, myOctets, myData, myPem, myRev, j Dim myLabel, myOctets, myData, myPem, myRev, myUntrusted, j
myNumSkipped = 0
myNumCerts = 0
myData = "" myData = ""
myLines = Split(myCdData, vbLf, -1) myLines = Split(myCdData, vbLf, -1)
Set myFh = objFSO.OpenTextFile(myCaFile, 2, TRUE) Set myFh = objFSO.OpenTextFile(myCaFile, 2, TRUE)
@ -109,7 +111,7 @@ myFh.Write "##" & vbLf
myFh.Write "## This is a bundle of X.509 certificates of public Certificate Authorities" & vbLf myFh.Write "## This is a bundle of X.509 certificates of public Certificate Authorities" & vbLf
myFh.Write "## (CA). These were automatically extracted from Mozilla's root certificates" & vbLf myFh.Write "## (CA). These were automatically extracted from Mozilla's root certificates" & vbLf
myFh.Write "## file (certdata.txt). This file can be found in the mozilla source tree:" & vbLf myFh.Write "## file (certdata.txt). This file can be found in the mozilla source tree:" & vbLf
myFh.Write "## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt'" & vbLf myFh.Write "## '/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt'" & vbLf
myFh.Write "##" & vbLf myFh.Write "##" & vbLf
myFh.Write "## It contains the certificates in PEM format and therefore" & vbLf myFh.Write "## It contains the certificates in PEM format and therefore" & vbLf
myFh.Write "## can be directly used with curl / libcurl / php_curl, or with" & vbLf myFh.Write "## can be directly used with curl / libcurl / php_curl, or with" & vbLf
@ -125,6 +127,16 @@ For i = 0 To UBound(myLines)
If (myInsideCert = TRUE) Then If (myInsideCert = TRUE) Then
If InstrRev(myLines(i), "END") Then If InstrRev(myLines(i), "END") Then
myInsideCert = FALSE myInsideCert = FALSE
While (i < UBound(myLines)) And Not (myLines(i) = "#")
i = i + 1
If (InstrRev(myLines(i), "CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED") Or _
InstrRev(myLines(i), "CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN")) Then
myUntrusted = TRUE
End If
Wend
If (myUntrusted = TRUE) Then
myNumSkipped = myNumSkipped + 1
Else
myFh.Write myLabel & vbLf myFh.Write myLabel & vbLf
myFh.Write String(Len(myLabel), "=") & vbLf myFh.Write String(Len(myLabel), "=") & vbLf
myPem = "-----BEGIN CERTIFICATE-----" & vbLf & _ myPem = "-----BEGIN CERTIFICATE-----" & vbLf & _
@ -153,8 +165,8 @@ For i = 0 To UBound(myLines)
myTmpFh.Close myTmpFh.Close
objFSO.DeleteFile myTmpOut, TRUE objFSO.DeleteFile myTmpOut, TRUE
End If End If
myData = ""
myNumCerts = myNumCerts + 1 myNumCerts = myNumCerts + 1
End If
Else Else
myOctets = Split(myLines(i), "\") myOctets = Split(myLines(i), "\")
For j = 1 To UBound(myOctets) For j = 1 To UBound(myOctets)
@ -169,6 +181,8 @@ For i = 0 To UBound(myLines)
End If End If
If InstrRev(myLines(i), "CKA_VALUE MULTILINE_OCTAL") Then If InstrRev(myLines(i), "CKA_VALUE MULTILINE_OCTAL") Then
myInsideCert = TRUE myInsideCert = TRUE
myUntrusted = FALSE
myData = ""
End If End If
If InstrRev(myLines(i), "***** BEGIN LICENSE BLOCK *****") Then If InstrRev(myLines(i), "***** BEGIN LICENSE BLOCK *****") Then
myInsideLicense = TRUE myInsideLicense = TRUE
@ -191,7 +205,8 @@ For i = 0 To UBound(myLines)
End If End If
Next Next
myFh.Close myFh.Close
objShell.PopUp "Done (" & myNumCerts & " CA certs processed).", 20, mySelf, vbInformation objShell.PopUp "Done (" & myNumCerts & " CA certs processed, " & myNumSkipped & _
" untrusted skipped).", 20, mySelf, vbInformation
WScript.Quit 0 WScript.Quit 0
Function ConvertBinaryData(arrBytes) Function ConvertBinaryData(arrBytes)