From 822f3f4d22437c60cc64d3e8ee2a7f17343ee00e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 21 Oct 2023 14:21:29 +0200
Subject: [PATCH] consider going from unique or exporter to endpoint a
 downgrade

---
 .../conversations/crypto/sasl/ChannelBinding.java      | 10 ++++++++++
 .../crypto/sasl/ChannelBindingMechanism.java           |  9 +++++++++
 .../siacs/conversations/crypto/sasl/ScramSha1Plus.java |  2 +-
 .../conversations/crypto/sasl/ScramSha256Plus.java     |  2 +-
 .../conversations/crypto/sasl/ScramSha512Plus.java     |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
index 216f3d7f8..2eb5e39fb 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
@@ -117,4 +117,14 @@ public enum ChannelBinding {
                 throw new AssertionError("Missing short name for " + channelBinding);
         }
     }
+
+    public static int priority(final ChannelBinding channelBinding) {
+        if (Arrays.asList(TLS_EXPORTER,TLS_UNIQUE).contains(channelBinding)) {
+            return 2;
+        } else if (channelBinding == ChannelBinding.TLS_SERVER_END_POINT) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
 }
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBindingMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBindingMechanism.java
index b94210a60..7343eb86e 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBindingMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBindingMechanism.java
@@ -97,4 +97,13 @@ public interface ChannelBindingMechanism {
         messageDigest.update(encodedCertificate);
         return messageDigest.digest();
     }
+
+    static int getPriority(final SaslMechanism mechanism) {
+        if (mechanism instanceof ChannelBindingMechanism) {
+            final ChannelBindingMechanism channelBindingMechanism = (ChannelBindingMechanism) mechanism;
+            return ChannelBinding.priority(channelBindingMechanism.getChannelBinding());
+        } else {
+            return 0;
+        }
+    }
 }
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1Plus.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1Plus.java
index 2ca27570f..4490d7621 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1Plus.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1Plus.java
@@ -27,7 +27,7 @@ public class ScramSha1Plus extends ScramPlusMechanism {
 
     @Override
     public int getPriority() {
-        return 35; // higher than SCRAM-SHA512 (30)
+        return 35 + ChannelBinding.priority(this.channelBinding); // higher than SCRAM-SHA512 (30)
     }
 
     @Override
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256Plus.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256Plus.java
index 4db33a2fa..eafc86fbc 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256Plus.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256Plus.java
@@ -27,7 +27,7 @@ public class ScramSha256Plus extends ScramPlusMechanism {
 
     @Override
     public int getPriority() {
-        return 40;
+        return 40 + ChannelBinding.priority(this.channelBinding);
     }
 
     @Override
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha512Plus.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha512Plus.java
index 5d8461973..d110e7708 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha512Plus.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha512Plus.java
@@ -27,7 +27,7 @@ public class ScramSha512Plus extends ScramPlusMechanism {
 
     @Override
     public int getPriority() {
-        return 45;
+        return 45 + ChannelBinding.priority(this.channelBinding);
     }
 
     @Override