PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

Add comments

Browse source
This commit is contained in:
Paul Schaub 2025-04-10 12:29:37 +02:00
parent b2d8935fc8
commit 151e0232c0
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/MergeCertsImpl.kt
View file

@ -24,8 +24,10 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
override fun baseCertificates(certs: InputStream): Ready { override fun baseCertificates(certs: InputStream): Ready {
return object : Ready() { return object : Ready() {
override fun writeTo(outputStream: OutputStream) { override fun writeTo(outputStream: OutputStream) {
val certList = api.readKey().parseCertificates(certs) val baseCertsList = api.readKey().parseCertificates(certs)
for (cert in certList) {
// Index and merge base certs
for (cert in baseCertsList) {
if (!baseCerts.contains(cert.keyIdentifier)) { if (!baseCerts.contains(cert.keyIdentifier)) {
baseCerts[cert.keyIdentifier] = cert baseCerts[cert.keyIdentifier] = cert
} else { } else {
@ -34,8 +36,10 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
} }
} }
// Merge updates with base certs
for (update in updateCerts) { for (update in updateCerts) {
if (baseCerts[update.keyIdentifier] == null) { if (baseCerts[update.keyIdentifier] == null) {
// skip updates with missing base certs
continue continue
} }
@ -49,6 +53,7 @@ class MergeCertsImpl(private val api: PGPainless) : MergeCerts {
outputStream outputStream
} }
// emit merged and updated base certs
for (merged in baseCerts.values) { for (merged in baseCerts.values) {
out.write(merged.getEncoded(PacketFormat.CURRENT)) out.write(merged.getEncoded(PacketFormat.CURRENT))
} }