'* | (__| |_| | _ <| |___\r
'* \___|\___/|_| \_\_____|\r
'*\r
-'* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+'* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.\r
'*\r
'* This software is licensed as described in the file COPYING, which\r
'* you should have received as part of this distribution. The terms\r
'* Hacked by Guenter Knauf\r
'***************************************************************************\r
Option Explicit\r
-Const myVersion = "0.3.5"\r
-\r
-Const myUrl = "http://mxr.mozilla.org/firefox/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1"\r
+Const myVersion = "0.3.9"\r
\r
+Const myUrl = "http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt"\r
Const myOpenssl = "openssl.exe"\r
\r
Const myCdSavF = FALSE ' Flag: save downloaded data to file certdata.txt\r
Const myCaBakF = TRUE ' Flag: backup existing ca-bundle certificate\r
Const myAskLiF = TRUE ' Flag: display certdata.txt license agreement\r
Const myAskTiF = TRUE ' Flag: ask to include certificate text info\r
+Const myWrapLe = 76 ' Default length of base64 output lines\r
\r
'******************* Nothing to configure below! *******************\r
Dim objShell, objNetwork, objFSO, objHttp\r
If objHttp Is Nothing Then Set objHttp = WScript.CreateObject("WinHttp.WinHttpRequest")\r
myBase = Left(WScript.ScriptFullName, InstrRev(WScript.ScriptFullName, "\"))\r
mySelf = Left(WScript.ScriptName, InstrRev(WScript.ScriptName, ".") - 1) & " " & myVersion\r
-myCdFile = Mid(myUrl, InstrRev(myUrl, "/") + 1, InstrRev(myUrl, "?") - InstrRev(myUrl, "/") - 1)\r
+myCdFile = Mid(myUrl, InstrRev(myUrl, "/") + 1)\r
myCaFile = "ca-bundle.crt"\r
myTmpName = InputBox("Enter output filename:", mySelf, myCaFile)\r
If Not (myTmpName = "") Then\r
objHttp.Open "GET", myUrl, FALSE\r
objHttp.setRequestHeader "User-Agent", WScript.ScriptName & "/" & myVersion\r
objHttp.Send ""\r
-If Not (objHttp.statusText = "OK") Then\r
- MsgBox("Failed to download '" & myCdFile & "': " & objHttp.statusText), vbCritical, mySelf\r
+If Not (objHttp.Status = 200) Then\r
+ MsgBox("Failed to download '" & myCdFile & "': " & objHttp.Status & " - " & objHttp.StatusText), vbCritical, mySelf\r
WScript.Quit 1\r
End If\r
' Convert data from ResponseBody instead of using ResponseText because of UTF-8\r
End If\r
End If\r
' Process the received data\r
-Dim myLines, myPattern, myInsideCert, myInsideLicense, myLicenseText, myNumCerts\r
-Dim myLabel, myOctets, myData, myPem, myRev, j\r
+Dim myLines, myPattern, myInsideCert, myInsideLicense, myLicenseText, myNumCerts, myNumSkipped\r
+Dim myLabel, myOctets, myData, myPem, myRev, myUntrusted, j\r
+myNumSkipped = 0\r
+myNumCerts = 0\r
myData = ""\r
myLines = Split(myCdData, vbLf, -1)\r
Set myFh = objFSO.OpenTextFile(myCaFile, 2, TRUE)\r
myFh.Write "## This is a bundle of X.509 certificates of public Certificate Authorities" & vbLf\r
myFh.Write "## (CA). These were automatically extracted from Mozilla's root certificates" & vbLf\r
myFh.Write "## file (certdata.txt). This file can be found in the mozilla source tree:" & vbLf\r
-myFh.Write "## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt'" & vbLf\r
+myFh.Write "## '/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt'" & vbLf\r
myFh.Write "##" & vbLf\r
myFh.Write "## It contains the certificates in PEM format and therefore" & vbLf\r
myFh.Write "## can be directly used with curl / libcurl / php_curl, or with" & vbLf\r
If (myInsideCert = TRUE) Then\r
If InstrRev(myLines(i), "END") Then\r
myInsideCert = FALSE\r
- myFh.Write myLabel & vbLf\r
- myFh.Write String(Len(myLabel), "=") & vbLf\r
- myPem = "-----BEGIN CERTIFICATE-----" & vbLf & _\r
- Base64Encode(myData) & vbLf & _\r
- "-----END CERTIFICATE-----" & vbLf\r
- If (myOptTxt = FALSE) Then\r
- myFh.Write myPem & vbLf\r
+ While (i < UBound(myLines)) And Not (myLines(i) = "#")\r
+ i = i + 1\r
+ If InstrRev(myLines(i), "CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR") Then\r
+ myUntrusted = FALSE\r
+ End If\r
+ Wend\r
+ If (myUntrusted = TRUE) Then\r
+ myNumSkipped = myNumSkipped + 1\r
Else\r
- Dim myCmd, myRval, myTmpIn, myTmpOut\r
- myTmpIn = objFSO.GetSpecialFolder(2).Path & "\" & objFSO.GetTempName\r
- myTmpOut = objFSO.GetSpecialFolder(2).Path & "\" & objFSO.GetTempName\r
- Set myTmpFh = objFSO.OpenTextFile(myTmpIn, 2, TRUE)\r
- myTmpFh.Write myPem\r
- myTmpFh.Close\r
- myCmd = myOpenssl & " x509 -md5 -fingerprint -text -inform PEM" & _\r
- " -in " & myTmpIn & " -out " & myTmpOut\r
- myRval = objShell.Run (myCmd, 0, TRUE)\r
- objFSO.DeleteFile myTmpIn, TRUE\r
- If Not (myRval = 0) Then\r
- MsgBox("Failed to process PEM cert with OpenSSL commandline!"), vbCritical, mySelf\r
+ myFh.Write myLabel & vbLf\r
+ myFh.Write String(Len(myLabel), "=") & vbLf\r
+ myPem = "-----BEGIN CERTIFICATE-----" & vbLf & _\r
+ Base64Encode(myData) & vbLf & _\r
+ "-----END CERTIFICATE-----" & vbLf\r
+ If (myOptTxt = FALSE) Then\r
+ myFh.Write myPem & vbLf\r
+ Else\r
+ Dim myCmd, myRval, myTmpIn, myTmpOut\r
+ myTmpIn = objFSO.GetSpecialFolder(2).Path & "\" & objFSO.GetTempName\r
+ myTmpOut = objFSO.GetSpecialFolder(2).Path & "\" & objFSO.GetTempName\r
+ Set myTmpFh = objFSO.OpenTextFile(myTmpIn, 2, TRUE)\r
+ myTmpFh.Write myPem\r
+ myTmpFh.Close\r
+ myCmd = myOpenssl & " x509 -md5 -fingerprint -text -inform PEM" & _\r
+ " -in " & myTmpIn & " -out " & myTmpOut\r
+ myRval = objShell.Run (myCmd, 0, TRUE)\r
+ objFSO.DeleteFile myTmpIn, TRUE\r
+ If Not (myRval = 0) Then\r
+ MsgBox("Failed to process PEM cert with OpenSSL commandline!"), vbCritical, mySelf\r
+ objFSO.DeleteFile myTmpOut, TRUE\r
+ WScript.Quit 3\r
+ End If\r
+ Set myTmpFh = objFSO.OpenTextFile(myTmpOut, 1)\r
+ myFh.Write myTmpFh.ReadAll & vbLf\r
+ myTmpFh.Close\r
objFSO.DeleteFile myTmpOut, TRUE\r
- WScript.Quit 3\r
End If\r
- Set myTmpFh = objFSO.OpenTextFile(myTmpOut, 1)\r
- myFh.Write myTmpFh.ReadAll & vbLf\r
- myTmpFh.Close\r
- objFSO.DeleteFile myTmpOut, TRUE\r
+ myNumCerts = myNumCerts + 1\r
End If\r
- myData = ""\r
- myNumCerts = myNumCerts + 1\r
Else\r
myOctets = Split(myLines(i), "\")\r
For j = 1 To UBound(myOctets)\r
End If\r
If InstrRev(myLines(i), "CKA_VALUE MULTILINE_OCTAL") Then\r
myInsideCert = TRUE\r
+ myUntrusted = TRUE\r
+ myData = ""\r
End If\r
If InstrRev(myLines(i), "***** BEGIN LICENSE BLOCK *****") Then\r
myInsideLicense = TRUE\r
End If\r
Next\r
myFh.Close\r
-objShell.PopUp "Done (" & myNumCerts & " CA certs processed).", 20, mySelf, vbInformation\r
+objShell.PopUp "Done (" & myNumCerts & " CA certs processed, " & myNumSkipped & _\r
+ " untrusted skipped).", 20, mySelf, vbInformation\r
WScript.Quit 0\r
\r
Function ConvertBinaryData(arrBytes)\r
\r
Function Base64Encode(inData)\r
Const Base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"\r
- Dim cOut, sOut, I\r
+ Dim cOut, sOut, lWrap, I\r
+ lWrap = Int(myWrapLe * 3 / 4)\r
\r
'For each group of 3 bytes\r
For I = 1 To Len(inData) Step 3\r
'Add the part To OutPut string\r
sOut = sOut + pOut\r
\r
- 'Add a new line For Each 76 chars In dest (76*3/4 = 57)\r
+ 'Add a new line For Each myWrapLe chars In dest\r
If (I < Len(inData) - 2) Then\r
- If (I + 2) Mod 57 = 0 Then sOut = sOut & vbLf\r
+ If (I + 2) Mod lWrap = 0 Then sOut = sOut & vbLf\r
End If\r
Next\r
Select Case Len(inData) Mod 3\r
projects / external / curl.git / blobdiff