nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1881117 - add convenience functions for listing third party certificates r=jschanck

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D202270
This commit is contained in:
Dana Keeler 2024-02-23 00:13:07 +00:00
parent 17830a8b9f
commit 5222fcff10
2 changed files with 51 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
security/manager/ssl/nsINSSComponent.idl
View file

@ -45,11 +45,13 @@ interface nsINSSComponent : nsISupports {
* function returns an empty array on all other platforms. * function returns an empty array on all other platforms.
*/ */
Array<Array<octet> > getEnterpriseRoots(); Array<Array<octet> > getEnterpriseRoots();
ACString getEnterpriseRootsPEM();
/** /**
* Similarly, but for intermediate certificates. * Similarly, but for intermediate certificates.
*/ */
Array<Array<octet> > getEnterpriseIntermediates(); Array<Array<octet> > getEnterpriseIntermediates();
ACString getEnterpriseIntermediatesPEM();
/** /**
* Test utility for adding an intermediate certificate to the current set of * Test utility for adding an intermediate certificate to the current set of

49
security/manager/ssl/nsNSSComponent.cpp
View file

@ -20,6 +20,7 @@
#include "mozilla/AppShutdown.h" #include "mozilla/AppShutdown.h"
#include "mozilla/ArrayUtils.h" #include "mozilla/ArrayUtils.h"
#include "mozilla/Assertions.h" #include "mozilla/Assertions.h"
#include "mozilla/Base64.h"
#include "mozilla/Casting.h" #include "mozilla/Casting.h"
#include "mozilla/EndianUtils.h" #include "mozilla/EndianUtils.h"
#include "mozilla/FilePreferences.h" #include "mozilla/FilePreferences.h"
@ -393,12 +394,60 @@ nsNSSComponent::GetEnterpriseRoots(
return CommonGetEnterpriseCerts(enterpriseRoots, true); return CommonGetEnterpriseCerts(enterpriseRoots, true);
} }
nsresult BytesArrayToPEM(const nsTArray<nsTArray<uint8_t>>& bytesArray,
nsACString& pemArray) {
for (const auto& bytes : bytesArray) {
nsAutoCString base64;
nsresult rv = Base64Encode(reinterpret_cast<const char*>(bytes.Elements()),
bytes.Length(), base64);
if (NS_FAILED(rv)) {
return rv;
}
if (!pemArray.IsEmpty()) {
pemArray.AppendLiteral("\n");
}
pemArray.AppendLiteral("-----BEGIN CERTIFICATE-----\n");
for (size_t i = 0; i < base64.Length() / 64; i++) {
pemArray.Append(Substring(base64, i * 64, 64));
pemArray.AppendLiteral("\n");
}
if (base64.Length() % 64 != 0) {
size_t chunks = base64.Length() / 64;
pemArray.Append(Substring(base64, chunks * 64));
pemArray.AppendLiteral("\n");
}
pemArray.AppendLiteral("-----END CERTIFICATE-----");
}
return NS_OK;
}
NS_IMETHODIMP
nsNSSComponent::GetEnterpriseRootsPEM(nsACString& enterpriseRootsPEM) {
nsTArray<nsTArray<uint8_t>> enterpriseRoots;
nsresult rv = GetEnterpriseRoots(enterpriseRoots);
if (NS_FAILED(rv)) {
return rv;
}
return BytesArrayToPEM(enterpriseRoots, enterpriseRootsPEM);
}
NS_IMETHODIMP NS_IMETHODIMP
nsNSSComponent::GetEnterpriseIntermediates( nsNSSComponent::GetEnterpriseIntermediates(
nsTArray<nsTArray<uint8_t>>& enterpriseIntermediates) { nsTArray<nsTArray<uint8_t>>& enterpriseIntermediates) {
return CommonGetEnterpriseCerts(enterpriseIntermediates, false); return CommonGetEnterpriseCerts(enterpriseIntermediates, false);
} }
NS_IMETHODIMP
nsNSSComponent::GetEnterpriseIntermediatesPEM(
nsACString& enterpriseIntermediatesPEM) {
nsTArray<nsTArray<uint8_t>> enterpriseIntermediates;
nsresult rv = GetEnterpriseIntermediates(enterpriseIntermediates);
if (NS_FAILED(rv)) {
return rv;
}
return BytesArrayToPEM(enterpriseIntermediates, enterpriseIntermediatesPEM);
}
NS_IMETHODIMP NS_IMETHODIMP
nsNSSComponent::AddEnterpriseIntermediate( nsNSSComponent::AddEnterpriseIntermediate(
const nsTArray<uint8_t>& intermediateBytes) { const nsTArray<uint8_t>& intermediateBytes) {