Merge branch 'main' into main

Keyfactor · Mar 11, 2024 · 4a5629d · 4a5629d
2 parents ef93f1d + d9c34d5
commit 4a5629d
Show file tree

Hide file tree

Showing 375 changed files with 12,514 additions and 1,748 deletions.
diff --git a/signserver/.gitignore b/signserver/.gitignore
@@ -124,7 +124,6 @@ dist-*/
 /lib/ext/apksig-*
 /lib/ext/jdbc/*.jar
 /lib/ext/dss-*
-/lib/ext/commons-lang3-*
 /lib/ext/commons-net-*
 /lib/ext/specs-*
 /lib/ext/validation-*

diff --git a/signserver/build.xml b/signserver/build.xml
@@ -191,14 +191,14 @@ Installation Guide for details.
         <echo message="Filtering jars..."/>
 
         <!-- cesecore-common.jar -->
-        <property name="cesecore-common.jar" value="cesecore-common-7.0.0.1.jar"/>
+        <property name="cesecore-common.jar" value="cesecore-common-7.0.0.1signserver6.2.0.jar"/>
         <move todir="${tmp}" file="${app.ear.dir}/lib/${cesecore-common.jar}"/>
         <jar destfile="${app.ear.dir}/lib/${cesecore-common.jar}">
             <zipfileset src="${tmp}/${cesecore-common.jar}" excludes="${cesecore.common.excludes}"/>
         </jar>
 
         <!-- x509-common-util.jar -->
-        <property name="kfc-x509-common-util.jar" value="x509-common-util-0.7.4.jar"/>
+        <property name="kfc-x509-common-util.jar" value="x509-common-util-0.10.5.jar"/>
         <move todir="${tmp}" file="${app.ear.dir}/lib/${kfc-x509-common-util.jar}"/>
         <jar destfile="${app.ear.dir}/lib/${kfc-x509-common-util.jar}">
             <zipfileset src="${tmp}/${kfc-x509-common-util.jar}" excludes="${kfc.x509.common.util.excludes}"/>
@@ -788,7 +788,6 @@ mvn install
             <exclude name=".eclipse/**" />
             <exclude name=".settings/**" />
             <exclude name="**/.cvsignore" />
-            <exclude name="**/*.sh" />
             <exclude name="**/nbproject/private/**" />
             <exclude name="**/target/**" />
 

diff --git a/signserver/doc/htdocs/APK_Hash_Signer.html b/signserver/doc/htdocs/APK_Hash_Signer.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>

diff --git a/signserver/doc/htdocs/APK_Lineage_Signer.html b/signserver/doc/htdocs/APK_Lineage_Signer.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>
@@ -1790,7 +1794,7 @@ <h1 class="heading "><span>Available Properties</span></h1>
         <p  ><a   href="APK_Signer.html">APK Signer</a> to update lineage for. Specify exactly one signer, pointing out the signer to update in the lineage.    </p>
             </td>
                 <td  class="confluenceTd" rowspan="1" colspan="1">
-        <p  >    <img  class="emoticon emoticon-tick" src="images/s/7clgp7/8703/189cb2l/_/images/icons/emoticons/check.svg" alt="images/s/7clgp7/8703/189cb2l/_/images/icons/emoticons/check.svg"   />
+        <p  >    <img  class="emoticon emoticon-tick" src="images/s/ndu796/8703/189cb2l/_/images/icons/emoticons/check.svg" alt="images/s/ndu796/8703/189cb2l/_/images/icons/emoticons/check.svg"   />
     </p>
             </td>
         </tr>

diff --git a/signserver/doc/htdocs/APK_Rotate_Signer.html b/signserver/doc/htdocs/APK_Rotate_Signer.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>
@@ -1783,7 +1787,7 @@ <h1 class="heading "><span>Available Properties</span></h1>
         <p  >Signers to include in the lineage. Specify exactly two signers: the old and new signers to include in the lineage.    </p>
             </td>
                 <td  class="confluenceTd" rowspan="1" colspan="1">
-        <p  >    <img  class="emoticon emoticon-tick" src="images/s/7clgp7/8703/189cb2l/_/images/icons/emoticons/check.svg" alt="images/s/7clgp7/8703/189cb2l/_/images/icons/emoticons/check.svg"   />
+        <p  >    <img  class="emoticon emoticon-tick" src="images/s/ndu796/8703/189cb2l/_/images/icons/emoticons/check.svg" alt="images/s/ndu796/8703/189cb2l/_/images/icons/emoticons/check.svg"   />
     </p>
             </td>
         </tr>

diff --git a/signserver/doc/htdocs/APK_Signer.html b/signserver/doc/htdocs/APK_Signer.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>

diff --git a/signserver/doc/htdocs/Accounter.html b/signserver/doc/htdocs/Accounter.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>

diff --git a/signserver/doc/htdocs/Accounters.html b/signserver/doc/htdocs/Accounters.html
@@ -60,7 +60,7 @@
     </script>
     </head>
 
-<body pageid="181288951">
+<body pageid="212959630">
 
 <div id="ht-loader">
     <noscript>
@@ -110,7 +110,7 @@ <h1 class="ht-logo">
                     <a href="../"><img src="projectlogo.png"></a>
                 </h1>
                 <div class="ht-version">
-                    <p>Version: 6.1.0</p>
+                    <p>Version: 6.2.0</p>
                 </div>
             </header>
 
@@ -142,6 +142,10 @@ <h2>SignServer Manual</h2>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Architecture_and_Concepts.html">Architecture and Concepts</a>
 
+            </li>
+                                        <li class="leaf">
+        <a class="ht-nav-page-link" href="Library_Manifest.html">Library Manifest</a>
+
             </li>
                                         <li class="leaf">
         <a class="ht-nav-page-link" href="Interoperability.html">Interoperability</a>