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

Prevent NULL encryption algorithm

Browse source
This commit is contained in:
Paul Schaub 2025-05-06 17:05:47 +02:00
parent 620f35cdd1
commit 7062681d03
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pgpainless-core/src/main/kotlin/org/pgpainless/algorithm/negotiation/SymmetricKeyAlgorithmNegotiator.kt
View file

@ -4,7 +4,6 @@
package org.pgpainless.algorithm.negotiation package org.pgpainless.algorithm.negotiation
import java.lang.IllegalArgumentException
import org.pgpainless.algorithm.SymmetricKeyAlgorithm import org.pgpainless.algorithm.SymmetricKeyAlgorithm
import org.pgpainless.policy.Policy import org.pgpainless.policy.Policy
@ -36,9 +35,8 @@ interface SymmetricKeyAlgorithmNegotiator {
override: SymmetricKeyAlgorithm?, override: SymmetricKeyAlgorithm?,
keyPreferences: List<Set<SymmetricKeyAlgorithm>> keyPreferences: List<Set<SymmetricKeyAlgorithm>>
): SymmetricKeyAlgorithm { ): SymmetricKeyAlgorithm {
if (override == SymmetricKeyAlgorithm.NULL) { require (override != SymmetricKeyAlgorithm.NULL) {
throw IllegalArgumentException( "Algorithm override cannot be NULL (plaintext)."
"Algorithm override cannot be NULL (plaintext).")
} }
if (override != null) { if (override != null) {

4
pgpainless-core/src/main/kotlin/org/pgpainless/encryption_signing/EncryptionOptions.kt
View file

@ -405,6 +405,10 @@ class EncryptionOptions(private val purpose: EncryptionPurpose, private val api:
} }
fun overrideEncryptionMechanism(encryptionMechanism: MessageEncryptionMechanism) = apply { fun overrideEncryptionMechanism(encryptionMechanism: MessageEncryptionMechanism) = apply {
require(api.algorithmPolicy.symmetricKeyEncryptionAlgorithmPolicy.isAcceptable(
encryptionMechanism.symmetricKeyAlgorithm)) {
"Provided symmetric encryption algorithm is not acceptable."
}
_encryptionMechanismOverride = encryptionMechanism _encryptionMechanismOverride = encryptionMechanism
} }