38 files changed, 71 insertions, 27 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index d3319480ab3..62985192ad3 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -176,6 +176,7 @@
                 model-evaluation-jar-with-dependencies.jar,
                 vespaclient-container-plugin-jar-with-dependencies.jar,
                 vespa-athenz-jar-with-dependencies.jar,
+                security-utils-jar-with-dependencies.jar,
                 simplemetrics-jar-with-dependencies.jar,
                 defaults-jar-with-dependencies.jar,
                 component-jar-with-dependencies.jar,
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
index 879036db355..20d34b2489e 100644
--- a/jdisc_http_service/pom.xml
+++ b/jdisc_http_service/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
+      <artifactId>security-utils</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/jrt/pom.xml b/jrt/pom.xml
index 84578f9e04d..6852c6deee6 100644
--- a/jrt/pom.xml
+++ b/jrt/pom.xml
@@ -19,11 +19,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>annotations</artifactId>
       <version>${project.version}</version>
@@ -34,6 +29,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>security-utils</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src</sourceDirectory>
diff --git a/pom.xml b/pom.xml
index caa875a1918..f749adbdabf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
         <module>searchcore</module>
         <module>searchlib</module>
         <module>searchsummary</module>
+        <module>security-utils</module>
         <module>serviceview</module>
         <module>service-monitor</module>
         <module>simplemetrics</module>
diff --git a/security-utils/OWNERS b/security-utils/OWNERS
new file mode 100644
index 00000000000..569bf1cc3a1
--- /dev/null
+++ b/security-utils/OWNERS
@@ -0,0 +1 @@
+bjorncs
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
new file mode 100644
index 00000000000..7006a0f5f86
--- /dev/null
+++ b/security-utils/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.yahoo.vespa</groupId>
+    <artifactId>parent</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+  <artifactId>security-utils</artifactId>
+  <packaging>container-plugin</packaging>
+  <version>6-SNAPSHOT</version>
+  <dependencies>
+    <!-- provided -->
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- compile scope -->
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- test scope -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.yahoo.vespa</groupId>
+        <artifactId>bundle-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/vespajlib/src/main/java/com/yahoo/security/BasicConstraintsExtension.java b/security-utils/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
index d3c08ba27d0..d3c08ba27d0 100644
--- a/vespajlib/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
+++ b/security-utils/src/main/java/com/yahoo/security/BasicConstraintsExtension.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java b/security-utils/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
index 48a23a1fe7e..48a23a1fe7e 100644
--- a/vespajlib/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
+++ b/security-utils/src/main/java/com/yahoo/security/BouncyCastleProviderHolder.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/Extension.java b/security-utils/src/main/java/com/yahoo/security/Extension.java
index 46b781c9c86..46b781c9c86 100644
--- a/vespajlib/src/main/java/com/yahoo/security/Extension.java
+++ b/security-utils/src/main/java/com/yahoo/security/Extension.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/KeyAlgorithm.java b/security-utils/src/main/java/com/yahoo/security/KeyAlgorithm.java
index 3218f81f0d6..3218f81f0d6 100644
--- a/vespajlib/src/main/java/com/yahoo/security/KeyAlgorithm.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyAlgorithm.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/KeyStoreBuilder.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
index 2160fbf6455..2160fbf6455 100644
--- a/vespajlib/src/main/java/com/yahoo/security/KeyStoreBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/KeyStoreType.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreType.java
index 7fb8df35286..7fb8df35286 100644
--- a/vespajlib/src/main/java/com/yahoo/security/KeyStoreType.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreType.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/KeyStoreUtils.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreUtils.java
index f0c4d99bf69..f0c4d99bf69 100644
--- a/vespajlib/src/main/java/com/yahoo/security/KeyStoreUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreUtils.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/KeyUtils.java b/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
index 11fb0f432e4..11fb0f432e4 100644
--- a/vespajlib/src/main/java/com/yahoo/security/KeyUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyUtils.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/Pkcs10Csr.java b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
index e08ee117fcd..e08ee117fcd 100644
--- a/vespajlib/src/main/java/com/yahoo/security/Pkcs10Csr.java
+++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java b/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
index 0fe6117ef2f..0fe6117ef2f 100644
--- a/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrBuilder.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java b/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
index 6f12450528d..6f12450528d 100644
--- a/vespajlib/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10CsrUtils.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/SignatureAlgorithm.java b/security-utils/src/main/java/com/yahoo/security/SignatureAlgorithm.java
index fbff18f5c12..fbff18f5c12 100644
--- a/vespajlib/src/main/java/com/yahoo/security/SignatureAlgorithm.java
+++ b/security-utils/src/main/java/com/yahoo/security/SignatureAlgorithm.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
index 75ab2417edf..75ab2417edf 100644
--- a/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
index 29395c75e70..29395c75e70 100644
--- a/vespajlib/src/main/java/com/yahoo/security/SubjectAlternativeName.java
+++ b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/X509CertificateBuilder.java b/security-utils/src/main/java/com/yahoo/security/X509CertificateBuilder.java
index 54d7d39253e..54d7d39253e 100644
--- a/vespajlib/src/main/java/com/yahoo/security/X509CertificateBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateBuilder.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/X509CertificateUtils.java b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
index 33bd750bac5..33bd750bac5 100644
--- a/vespajlib/src/main/java/com/yahoo/security/X509CertificateUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/package-info.java b/security-utils/src/main/java/com/yahoo/security/package-info.java
index 10a4c9c0e0d..10a4c9c0e0d 100644
--- a/vespajlib/src/main/java/com/yahoo/security/package-info.java
+++ b/security-utils/src/main/java/com/yahoo/security/package-info.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
index f0d1edd6889..f0d1edd6889 100644
--- a/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptions.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
index 5595d33a9b5..5595d33a9b5 100644
--- a/vespajlib/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
diff --git a/vespajlib/src/main/java/com/yahoo/security/tls/package-info.java b/security-utils/src/main/java/com/yahoo/security/tls/package-info.java
index b5668182f14..b5668182f14 100644
--- a/vespajlib/src/main/java/com/yahoo/security/tls/package-info.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/package-info.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java b/security-utils/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
index 06ea5d963a3..06ea5d963a3 100644
--- a/vespajlib/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/KeyStoreBuilderTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/KeyUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
index 5e786654d7c..5e786654d7c 100644
--- a/vespajlib/src/test/java/com/yahoo/security/KeyUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/KeyUtilsTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
index d51203a5cb2..d51203a5cb2 100644
--- a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrBuilderTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrTest.java b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
index cc1f6cc6a14..cc1f6cc6a14 100644
--- a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
index 04d35a537bb..04d35a537bb 100644
--- a/vespajlib/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/Pkcs10CsrUtilsTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/SslContextBuilderTest.java b/security-utils/src/test/java/com/yahoo/security/SslContextBuilderTest.java
index cc269a4ef43..cc269a4ef43 100644
--- a/vespajlib/src/test/java/com/yahoo/security/SslContextBuilderTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/SslContextBuilderTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/TestUtils.java b/security-utils/src/test/java/com/yahoo/security/TestUtils.java
index fcfcfb2b761..fcfcfb2b761 100644
--- a/vespajlib/src/test/java/com/yahoo/security/TestUtils.java
+++ b/security-utils/src/test/java/com/yahoo/security/TestUtils.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java b/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
index 7e6d343b570..7e6d343b570 100644
--- a/vespajlib/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/X509CertificateBuilderTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
index 76a93028efe..76a93028efe 100644
--- a/vespajlib/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/X509CertificateUtilsTest.java
diff --git a/vespajlib/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
index f311651cab0..f311651cab0 100644
--- a/vespajlib/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/TransportSecurityOptionsTest.java
diff --git a/vespajlib/src/test/resources/transport-security-options.json b/security-utils/src/test/resources/transport-security-options.json
index 0506c130722..0506c130722 100644
--- a/vespajlib/src/test/resources/transport-security-options.json
+++ b/security-utils/src/test/resources/transport-security-options.json
diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index 741b4b58cc9..68a959b2e30 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -36,7 +36,6 @@
       <artifactId>jna</artifactId>
     </dependency>
 
-
     <!-- provided scope -->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -55,26 +54,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- test scope -->
     <dependency>
@@ -98,6 +77,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
   <build>