Merge pull request #8218 from vespa-engine/bjorncs/tls

bjorncs/tls  

1 files changed, 9 insertions, 0 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
index f75cb4bcfff..a6291477942 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/json/TransportSecurityOptionsJsonSerializer.java
@@ -70,6 +70,12 @@ public class TransportSecurityOptionsJsonSerializer {
             }
             builder.withAuthorizedPeers(new AuthorizedPeers(toPeerPolicies(authorizedPeersEntity)));
         }
+        if (entity.acceptedCiphers != null) {
+            if (entity.acceptedCiphers.isEmpty()) {
+                throw new IllegalArgumentException("'accepted-ciphers' cannot be empty");
+            }
+            builder.withAcceptedCiphers(entity.acceptedCiphers);
+        }
         return builder.build();
     }
 
@@ -145,6 +151,9 @@ public class TransportSecurityOptionsJsonSerializer {
                 entity.authorizedPeers.add(authorizedPeer);
             }
         });
+        if (!options.getAcceptedCiphers().isEmpty()) {
+            entity.acceptedCiphers = options.getAcceptedCiphers();
+        }
         return entity;
     }