diff --git a/json/build.xml b/json/build.xml
index ee04a9ef..f717796b 100644
--- a/json/build.xml
+++ b/json/build.xml
@@ -1,15 +1,17 @@
-<project name="JWS Clear-text Signature Demo" default="help">
+<project name="JSON Signature Format Demo" default="help">
 
   <!-- set properties for this build -->
   <property name="src.dir" value="src"/>
-  <property name="class_war_path" value="WEB-INF/classes/org/webpki/webapps/json/jws"/>
+  <property name="class_war_path" value="WEB-INF/classes/org/webpki/webapps/jsf"/>
   
-  <property name="appcorename" value="jws-ct"/>
+  <property name="appcorename" value="jsf"/>
   <property name="application" value="${appcorename}.war"/>
   
   <property name="keypassword" value="foo123"/>
   <property name="keyfilext" value=".p12"/>
   <property name="key.dir" location="keys"/>
+  <property name="dist.dir" value="location"/>
+  <property name="temp.dir" location=".tmp"/>
   <property name="logotype.dir" location="logotype"/>
   
   <property name="clientroot" value="mybank-clientroot"/>
@@ -18,30 +20,20 @@
   
   <property name="debug" value="on"/>
   <property environment="env"/>
-  <property name="third.party.lib.dir" location="../resources/third-party-jars"/>
+  <property name="bcprovider.lib.dir" location="../resources/third-party-jars"/>
   <property name="webpki.lib.dir" location="../library/dist"/>
   <property name="catalina.home" value="${env.CATALINA_HOME}"/>
+  <property name="bouncycastle" value="true"/>
+  <property name="javaversion" value="1.8"/>
 
   <property name="signature.dir" location="signature"/>
 
-	<resources id="jcs_application.xml">
-<string><![CDATA[    <!-- JWS Demo -->
-    <module>
-        <web>
-            <web-uri>${application}</web-uri>
-            <context-root>/${appcorename}</context-root>
-        </web>
-    </module>
-</application>]]></string>
-    </resources>
-  <property name="ejbca-app-xml-mod" refid="jcs_application.xml"/>
-
   <condition property="storetype" value="PKCS12" else="JKS">
     <matches pattern=".*\.p12$" string="${keyfilext}"/>
   </condition>
 
   <target name="help">
-      <echo message="build tomcat [-Djose=0] ejbca-jcs zip-distribution createcerts"/>
+      <echo message="build tomcat createcerts"/>
   </target>
 
   <target name="_init" unless="app_path">
@@ -53,14 +45,11 @@
 
   </target>
 
-  <target name="_delete_tmp" unless="${ejbca.tmp.path}">
+  <target name="build">
     <delete dir="${temp.dir}"/>
     <mkdir dir="${temp.dir}"/>
-  </target>
-  
-  <target name="_build">
-    <property name="temp.dir" value=".tmp"/>
-    <antcall target="_delete_tmp"/>
+    <property name="zip.bcprovider.lib.dir" value="${bcprovider.lib.dir}"/>
+    <property name="zip.webpki.lib.dir" value="${webpki.lib.dir}"/>
     <fixcrlf srcdir="${src.dir}"
        tab="remove"
        tablength="4"
@@ -73,12 +62,19 @@
            target="${javaversion}"
            srcdir="${src.dir}"
            destdir="${temp.dir}"
-           classpath="${compile_classpath}"
-           includeAntRuntime="false"/>
+           includeAntRuntime="false">
+  		<classpath>
+  			 <fileset dir="${webpki.lib.dir}">
+  		        <include name="*.jar"/>
+  			 </fileset>
+  			 <fileset dir="${bcprovider.lib.dir}">
+  		        <include name="*.jar"/>
+  			 </fileset>
+  	    </classpath>
+    </javac>
     <property name="clientkey" value="${clientkey_rsa}"/>
-    <property name="bouncycastle.first" value="true"/>
     <replace file="${temp.dir}/web.xml">
-	  <replacefilter token="@bouncycastle-first@" value="${bouncycastle.first}"/>
+	  <replacefilter token="@bouncycastle-first@" value="${bouncycastle}"/>
 	  <replacefilter token="@key-password@" value="${keypassword}"/>
 	  <replacefilter token="@clientkey-rsa@" value="${clientkey_rsa}${keyfilext}"/>
 	  <replacefilter token="@clientkey-ec@" value="${clientkey_ec}${keyfilext}"/>
@@ -87,7 +83,7 @@
       <classes dir="${temp.dir}">
          <exclude name="web.xml"/>
       </classes>
-      <lib dir="${zip.third.party.lib.dir}">
+      <lib dir="${zip.bcprovider.lib.dir}">
          <include name="bcprov-*.jar"/>
       </lib>
       <lib dir="${zip.webpki.lib.dir}">
@@ -102,55 +98,10 @@
   </target>
 
   <target name="tomcat" depends="_init">
-    <!-- Set path to application.  -->
-    <property name="dist.dir" value="dist"/>
     <antcall target="build"/>
     <copy file="${dist.dir}/${application}" todir="${env.CATALINA_HOME}/webapps" overwrite="true" preservelastmodified="true"/>
   </target>
   
-  <!-- ejbca plugin -->
-  <target name="jcs-ejbca">
-     <echo message="JCS Demo Plugin"/>
-     <property name="zip.third.party.lib.dir" value="empty.lib"/>
-     <property name="zip.webpki.lib.dir" value="empty.lib"/>
-     <property name="dist.dir" value="${ejbca.gen.path}"/>
-     <path id="compile.classpath.ejbca">
-	    <fileset dir="${plugin.ejbca.ant.custom.enrollment_plugin_directory}/lib.common">
-           <include name="*.jar"/>
-        </fileset>
-        <pathelement path="${ejbca.classpath}"/>
-	 </path>
-     <property name="compile_classpath" refid="compile.classpath.ejbca"/>
-     <property name="temp.dir" value="${ejbca.tmp.path}"/>
-     <property name="bouncycastle.first" value="false"/>
-     <antcall target="_build">
-        <param name="javaversion" value="1.6"/>
-     </antcall>
-     <!-- Update application.xml -->
-     <replace file="${ejbca.app.xml}" value="${ejbca-app-xml-mod}">
-	    <replacetoken><![CDATA[</application>]]></replacetoken>
-     </replace>
-  </target>
-
-  <target name="build">
-    <!-- Set path to application.  -->
-    <property name="dist.dir" value="dist"/>
-    <property name="zip.third.party.lib.dir" value="${third.party.lib.dir}"/>
-    <property name="zip.webpki.lib.dir" value="${webpki.lib.dir}"/>
-    <path id="compile.classpath">
-	  <fileset dir="${webpki.lib.dir}">
-        <include name="*.jar"/>
-     </fileset>
-     <fileset dir="${third.party.lib.dir}">
-	    <include name="*.jar"/>
-      </fileset>
-	</path>
-	<property name="compile_classpath" refid="compile.classpath"/>
-    <antcall target="_build">
-       <param name="javaversion" value="1.8"/>
-    </antcall>
-  </target>
-
   <target name="_createcert">
   	<java fork="yes"
   		  classname="org.webpki.ca.CommandLineCA"
@@ -160,7 +111,7 @@
   			 <fileset dir="${webpki.lib.dir}">
   		        <include name="*.jar"/>
   			 </fileset>
-  			 <fileset dir="${third.party.lib.dir}">
+  			 <fileset dir="${bcprovider.lib.dir}">
   		        <include name="*.jar"/>
   			 </fileset>
   	    </classpath>
@@ -180,32 +131,4 @@
     </antcall>
   </target>
   
-  <target name="_unzipit" if="uu">
-    <delete dir="${dd}/${appcorename}"/>
-    <unzip src="${dd}/${appcorename}.zip" dest="${dd}"/>
-  </target>
-
-  <target name="zip-distribution">
-    <fail unless="dd" message="-&#10;
-***************************************************************&#10;
- You must define a distribution directory using the -D option:&#10;
- ant zip-distribution -Ddd=the_path_to_the_directory.&#10;
- Optionally you can specify -Duu=0 which deletes ${appcorename}&#10;
- and replaces the directory with the unzipped content&#10;
-***************************************************************&#10;"/>
-	<echo message="Producing ${appcorename} .zip and .zip.SHA1 files..."/> 
-   	<delete file="${dd}/${appcorename}.zip" failonerror="false"/>
-    <zip destfile="${dd}/${appcorename}.zip">
-      <zipfileset dir="." prefix="${appcorename}">
-       	<exclude name="/**/.*"/>
-        <exclude name="/.tmp/**"/>
-       	<exclude name="**/.settings/**"/>
-       	<exclude name="**/bin/**"/>
-       	<exclude name="dist/**"/>
-      </zipfileset>
-    </zip>
-    <checksum file="${dd}/${appcorename}.zip" fileext=".SHA1" algorithm="sha1" forceOverwrite="yes"/>
-    <antcall target="_unzipit"/>
-  </target>
-   
 </project>
diff --git a/json/location/jsf.war b/json/location/jsf.war
new file mode 100644
index 00000000..dcb61da8
Binary files /dev/null and b/json/location/jsf.war differ
diff --git a/json/src/org/webpki/webapps/json/jws/AsymSignatureHelper.java b/json/src/org/webpki/webapps/jsf/AsymSignatureHelper.java
similarity index 93%
rename from json/src/org/webpki/webapps/json/jws/AsymSignatureHelper.java
rename to json/src/org/webpki/webapps/jsf/AsymSignatureHelper.java
index c26ff1f2..3a428ae5 100644
--- a/json/src/org/webpki/webapps/json/jws/AsymSignatureHelper.java
+++ b/json/src/org/webpki/webapps/jsf/AsymSignatureHelper.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
@@ -30,7 +30,7 @@
 public class AsymSignatureHelper extends KeyStoreSigner implements  AsymKeySignerInterface {
     AsymSignatureHelper(KeyStore signer_keystore) throws IOException {
         super(signer_keystore, null);
-        setKey(null, JWSService.key_password);
+        setKey(null, JSFService.key_password);
     }
 
     @Override
diff --git a/json/src/org/webpki/webapps/json/jws/CreateServlet.java b/json/src/org/webpki/webapps/jsf/CreateServlet.java
similarity index 98%
rename from json/src/org/webpki/webapps/json/jws/CreateServlet.java
rename to json/src/org/webpki/webapps/jsf/CreateServlet.java
index 06f1ab09..ac47a785 100644
--- a/json/src/org/webpki/webapps/json/jws/CreateServlet.java
+++ b/json/src/org/webpki/webapps/jsf/CreateServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/src/org/webpki/webapps/json/jws/GenerateSignature.java b/json/src/org/webpki/webapps/jsf/GenerateSignature.java
similarity index 95%
rename from json/src/org/webpki/webapps/json/jws/GenerateSignature.java
rename to json/src/org/webpki/webapps/jsf/GenerateSignature.java
index e5a8264c..611f8e9d 100644
--- a/json/src/org/webpki/webapps/json/jws/GenerateSignature.java
+++ b/json/src/org/webpki/webapps/jsf/GenerateSignature.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
@@ -80,12 +80,12 @@ public boolean verifyData(byte[] data, byte[] digest, MACAlgorithms algorithm, S
 
     byte[] sign(JSONObjectWriter wr) throws IOException {
         if (action == ACTION.X509) {
-            wr.setSignature(new JSONX509Signer(JWSService.clientkey_rsa.setExtendedCertPath(true)));
+            wr.setSignature(new JSONX509Signer(JSFService.clientkey_rsa.setExtendedCertPath(true)));
         } else if (action == ACTION.SYM) {
             wr.setSignature(new JSONSymKeySigner(new SymmetricOperations()).setKeyId(KEY_NAME));
         } else {
             wr.setSignature(new JSONAsymKeySigner(action == ACTION.RSA ? 
-                    JWSService.clientkey_rsa : JWSService.clientkey_ec).setOutputPublicKeyInfo(keyInlining));
+                    JSFService.clientkey_rsa : JSFService.clientkey_ec).setOutputPublicKeyInfo(keyInlining));
         }
         return wr.serializeToBytes(JSONOutputFormats.PRETTY_PRINT);
     }
diff --git a/json/src/org/webpki/webapps/json/jws/HTML.java b/json/src/org/webpki/webapps/jsf/HTML.java
similarity index 97%
rename from json/src/org/webpki/webapps/json/jws/HTML.java
rename to json/src/org/webpki/webapps/jsf/HTML.java
index 03eccfcf..dba1082f 100644
--- a/json/src/org/webpki/webapps/json/jws/HTML.java
+++ b/json/src/org/webpki/webapps/jsf/HTML.java
@@ -14,16 +14,18 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
 import javax.servlet.ServletException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.webpki.crypto.AlgorithmPreferences;
 import org.webpki.crypto.AsymSignatureAlgorithms;
+
 import org.webpki.json.JSONCryptoHelper;
 import org.webpki.json.JSONObjectWriter;
 
@@ -47,7 +49,7 @@ public class HTML {
     static final String HTML_INIT = "<!DOCTYPE html>"
         + "<html><head><link rel=\"icon\" href=\"webpkiorg.png\" sizes=\"192x192\">"
         + "<meta name=\"viewport\" content=\"initial-scale=1.0\"/>"
-        + "<title>JSON Signature Demo</title>"
+        + "<title>JSON Signature Format - Demo</title>"
         + "<style type=\"text/css\">html {overflow:auto} html, body {margin:0px;padding:0px;height:100%} "
         + "body {font-size:8pt;color:#000000;font-family:verdana,arial;background-color:white} "
         + "h2 {font-weight:bold;font-size:12pt;color:#000000;font-family:arial,verdana,helvetica} "
@@ -122,7 +124,7 @@ static String getHTML(String javascript, String bodyscript, String box) {
                 "><div style=\"cursor:pointer;padding:2pt 0 0 0;position:absolute;top:15pt;left:15pt;z-index:5;visibility:visible;width:100pt;"
         + "height:47pt;border-width:1px;border-style:solid;border-color:black;box-shadow:3pt 3pt 3pt #D0D0D0\""
         + " onclick=\"document.location.href='https://github.com/cyberphone'\" title=\"Home of WebPKI.org\">")
-                .append(JWSService.logotype)
+                .append(JSFService.logotype)
                 .append("</div><table cellapdding=\"0\" cellspacing=\"0\" width=\"100%\" height=\"100%\">")
                 .append(box).append("</table></body></html>");
         return s.toString();
@@ -168,21 +170,18 @@ public static void homePage(HttpServletResponse response, String baseurl)
         + "<tr><td align=\"center\" style=\"font-weight:bolder;font-size:10pt;font-family:arial,verdana\">JSON Clear Text Signature<br>&nbsp;</td></tr>"
         + "<tr><td align=\"left\"><a href=\""
         + baseurl
-        + "/verify\">Verify a JWS-CT on the server</a></td></tr>"
+        + "/verify\">Verify a JSF on the server</a></td></tr>"
         + "<tr><td>&nbsp;</td></tr>"
         + "<tr><td align=\"left\"><a href=\""
         + baseurl
-        + "/create\">Create a JWS-CT on the server</a></td></tr>"
+        + "/create\">Create a JSF on the server</a></td></tr>"
         + "<tr><td>&nbsp;</td></tr>"
         + "<tr><td align=\"left\"><a href=\""
         + baseurl
-        + "/webcrypto\">Create a JWS-CT using WebCrypto</a></td></tr>"
+        + "/webcrypto\">Create a JSF using WebCrypto</a></td></tr>"
         + "<tr><td>&nbsp;</td></tr>"
-        + "<tr><td align=\"center\" colspan=\"2\"><b>JOSE Mode</b>=" +
-        JWSService.joseMode 
-        + "</td></tr>"
         + "<tr><td>&nbsp;</td></tr>"
-        + "<tr><td align=\"left\"><a target=\"_blank\" href=\"https://cyberphone.github.io/doc/security/jose-jcs.html\">JWS-CT Documentation</a></td></tr>"
+        + "<tr><td align=\"left\"><a target=\"_blank\" href=\"https://cyberphone.github.io/doc/security/jose-jcs.html\">JSF Documentation</a></td></tr>"
         + "</table></td></tr>"));
     }
 
diff --git a/json/src/org/webpki/webapps/json/jws/HomeServlet.java b/json/src/org/webpki/webapps/jsf/HomeServlet.java
similarity index 96%
rename from json/src/org/webpki/webapps/json/jws/HomeServlet.java
rename to json/src/org/webpki/webapps/jsf/HomeServlet.java
index b058931c..2638e438 100644
--- a/json/src/org/webpki/webapps/json/jws/HomeServlet.java
+++ b/json/src/org/webpki/webapps/jsf/HomeServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/src/org/webpki/webapps/json/jws/JWSService.java b/json/src/org/webpki/webapps/jsf/JSFService.java
similarity index 89%
rename from json/src/org/webpki/webapps/json/jws/JWSService.java
rename to json/src/org/webpki/webapps/jsf/JSFService.java
index 06eb8581..7811d0c7 100644
--- a/json/src/org/webpki/webapps/json/jws/JWSService.java
+++ b/json/src/org/webpki/webapps/jsf/JSFService.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,9 +32,9 @@
 
 import org.webpki.webutil.InitPropertyReader;
 
-public class JWSService extends InitPropertyReader implements
-        ServletContextListener {
-    static Logger logger = Logger.getLogger(JWSService.class.getName());
+public class JSFService extends InitPropertyReader implements  ServletContextListener {
+
+    static Logger logger = Logger.getLogger(JSFService.class.getName());
 
     static String key_password;
 
@@ -46,8 +46,6 @@ public class JWSService extends InitPropertyReader implements
     
     static String testSignature;
     
-    static boolean joseMode;
-
     InputStream getResource(String name) throws IOException {
         InputStream is = this.getClass().getResourceAsStream(name);
         if (is == null) {
@@ -84,8 +82,9 @@ public void contextInitialized(ServletContextEvent event) {
             // //////////////////////////////////////////////////////////////////////////////////////////
             // Keys
             // //////////////////////////////////////////////////////////////////////////////////////////
-            CustomCryptoProvider
-                    .forcedLoad(getPropertyBoolean("bouncycastle_first"));
+            if (!getPropertyString("bouncycastle_first").isEmpty()) {
+                CustomCryptoProvider.forcedLoad(true);
+            }
             key_password = getPropertyString("key_password");
             clientkey_rsa = new AsymSignatureHelper(KeyStoreReader.loadKeyStore(
                     getResource(getPropertyString("clientkey_rsa")),
@@ -94,7 +93,7 @@ public void contextInitialized(ServletContextEvent event) {
                     getResource(getPropertyString("clientkey_ec")),
                     key_password));
 
-            logger.info("JWS-CT Demo Successfully Initiated");
+            logger.info("JSF Demo Successfully Initiated");
         } catch (Exception e) {
             logger.log(Level.SEVERE, "********\n" + e.getMessage()
                     + "\n********", e);
diff --git a/json/src/org/webpki/webapps/json/jws/JavaScriptSignatureServlet.java b/json/src/org/webpki/webapps/jsf/JavaScriptSignatureServlet.java
similarity index 98%
rename from json/src/org/webpki/webapps/json/jws/JavaScriptSignatureServlet.java
rename to json/src/org/webpki/webapps/jsf/JavaScriptSignatureServlet.java
index dbb9b5b8..fc36a731 100644
--- a/json/src/org/webpki/webapps/json/jws/JavaScriptSignatureServlet.java
+++ b/json/src/org/webpki/webapps/jsf/JavaScriptSignatureServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/src/org/webpki/webapps/json/jws/NoWebCryptoServlet.java b/json/src/org/webpki/webapps/jsf/NoWebCryptoServlet.java
similarity index 96%
rename from json/src/org/webpki/webapps/json/jws/NoWebCryptoServlet.java
rename to json/src/org/webpki/webapps/jsf/NoWebCryptoServlet.java
index db9f2ef1..7078b440 100644
--- a/json/src/org/webpki/webapps/json/jws/NoWebCryptoServlet.java
+++ b/json/src/org/webpki/webapps/jsf/NoWebCryptoServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/src/org/webpki/webapps/json/jws/ReadSignature.java b/json/src/org/webpki/webapps/jsf/ReadSignature.java
similarity index 98%
rename from json/src/org/webpki/webapps/json/jws/ReadSignature.java
rename to json/src/org/webpki/webapps/jsf/ReadSignature.java
index e5bdef91..e89143c2 100644
--- a/json/src/org/webpki/webapps/json/jws/ReadSignature.java
+++ b/json/src/org/webpki/webapps/jsf/ReadSignature.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
@@ -163,7 +163,7 @@ void recurseObject(JSONObjectReader rd) throws IOException, GeneralSecurityExcep
                             preselectedKey =
                                     (AsymSignatureAlgorithms.getAlgorithmFromId(algo, 
                                                AlgorithmPreferences.JOSE_ACCEPT_PREFER).isRsa() ?
-                                            JWSService.clientkey_rsa : JWSService.clientkey_ec).getPublicKey();
+                                            JSFService.clientkey_rsa : JSFService.clientkey_ec).getPublicKey();
                             options.setRequirePublicKeyInfo(false);
                         }
                     }
diff --git a/json/src/org/webpki/webapps/json/jws/RequestServlet.java b/json/src/org/webpki/webapps/jsf/RequestServlet.java
similarity index 99%
rename from json/src/org/webpki/webapps/json/jws/RequestServlet.java
rename to json/src/org/webpki/webapps/jsf/RequestServlet.java
index e4b750a6..3c1b1afb 100644
--- a/json/src/org/webpki/webapps/json/jws/RequestServlet.java
+++ b/json/src/org/webpki/webapps/jsf/RequestServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/src/org/webpki/webapps/json/jws/VerifyServlet.java b/json/src/org/webpki/webapps/jsf/VerifyServlet.java
similarity index 94%
rename from json/src/org/webpki/webapps/json/jws/VerifyServlet.java
rename to json/src/org/webpki/webapps/jsf/VerifyServlet.java
index b78cd0b4..3588bd59 100644
--- a/json/src/org/webpki/webapps/json/jws/VerifyServlet.java
+++ b/json/src/org/webpki/webapps/jsf/VerifyServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
@@ -33,7 +33,7 @@ public class VerifyServlet extends HttpServlet {
 
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws IOException, ServletException {
-        HTML.verifyPage(response, request, JWSService.testSignature);
+        HTML.verifyPage(response, request, JSFService.testSignature);
     }
 
     public void doPost(HttpServletRequest request, HttpServletResponse response)
diff --git a/json/src/org/webpki/webapps/json/jws/WebCryptoServlet.java b/json/src/org/webpki/webapps/jsf/WebCryptoServlet.java
similarity index 96%
rename from json/src/org/webpki/webapps/json/jws/WebCryptoServlet.java
rename to json/src/org/webpki/webapps/jsf/WebCryptoServlet.java
index b668870e..b0d16bd3 100644
--- a/json/src/org/webpki/webapps/json/jws/WebCryptoServlet.java
+++ b/json/src/org/webpki/webapps/jsf/WebCryptoServlet.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.webpki.webapps.json.jws;
+package org.webpki.webapps.jsf;
 
 import java.io.IOException;
 
diff --git a/json/web.xml b/json/web.xml
index 48764cf8..700c251e 100644
--- a/json/web.xml
+++ b/json/web.xml
@@ -28,49 +28,43 @@
         <param-value>@clientkey-ec@</param-value>
     </context-param>
 
-    <context-param>
-        <description>JOSE Draft Mode</description>
-        <param-name>jose_mode</param-name>
-        <param-value>@jose_mode@</param-value>
-    </context-param>
-
     <listener>
-        <listener-class>org.webpki.webapps.json.jws.JWSService</listener-class>
+        <listener-class>org.webpki.webapps.jsf.JSFService</listener-class>
      </listener>
 
     <servlet>
 	    <servlet-name>RequestServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.RequestServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.RequestServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>HomeServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.HomeServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.HomeServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>VerifyServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.VerifyServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.VerifyServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>WebCryptoServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.WebCryptoServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.WebCryptoServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>NoWebCryptoServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.NoWebCryptoServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.NoWebCryptoServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>CreateServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.CreateServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.CreateServlet</servlet-class>
     </servlet>
     
     <servlet>
         <servlet-name>JavaScriptSignatureServlet</servlet-name>
-        <servlet-class>org.webpki.webapps.json.jws.JavaScriptSignatureServlet</servlet-class>
+        <servlet-class>org.webpki.webapps.jsf.JavaScriptSignatureServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
diff --git a/library/build.xml b/library/build.xml
index fb3c3ca6..2e4669bf 100644
--- a/library/build.xml
+++ b/library/build.xml
@@ -228,7 +228,7 @@
 
   	<!-- Make a copy that we can patch... -->
     <copy todir="${temp_dir}" preservelastmodified="true">
-      <fileset dir="${src_dir}">
+      <fileset dir="${test_dir}">
         <include name="org/webpki/sks/ws/**/*.java"/>
       </fileset>
     </copy>
diff --git a/library/deprecated/org/webpki/kg2xml/KeyGen2Constants.java b/library/deprecated/org/webpki/kg2xml/KeyGen2Constants.java
index 5deda27e..bc38c4ac 100644
--- a/library/deprecated/org/webpki/kg2xml/KeyGen2Constants.java
+++ b/library/deprecated/org/webpki/kg2xml/KeyGen2Constants.java
@@ -18,7 +18,7 @@
 
 public interface KeyGen2Constants
   {
-    String KEYGEN2_NS                                = "http://xmlns.webpki.org/keygen2/beta/20131201#";
+    String KEYGEN2_NS                                = "https://webpki.github.io/keygen2/beta/20131201#";
 
     String KEYGEN2_SCHEMA_FILE                       = "keygen2.xsd";
 
diff --git a/library/deprecated/org/webpki/kg2xml/KeyGen2URIs.java b/library/deprecated/org/webpki/kg2xml/KeyGen2URIs.java
index 3a420a33..fcaeb603 100644
--- a/library/deprecated/org/webpki/kg2xml/KeyGen2URIs.java
+++ b/library/deprecated/org/webpki/kg2xml/KeyGen2URIs.java
@@ -20,30 +20,30 @@ public interface KeyGen2URIs
   {
     public interface LOGOTYPES
       {
-        String ICON                        = "http://xmlns.webpki.org/keygen2/logotype#icon";
+        String ICON                        = "https://webpki.github.io/keygen2/logotype#icon";
 
-        String CARD                        = "http://xmlns.webpki.org/keygen2/logotype#card";
+        String CARD                        = "https://webpki.github.io/keygen2/logotype#card";
 
-        String LIST                        = "http://xmlns.webpki.org/keygen2/logotype#list";
+        String LIST                        = "https://webpki.github.io/keygen2/logotype#list";
 
-        String APPLICATION                 = "http://xmlns.webpki.org/keygen2/logotype#application";
+        String APPLICATION                 = "https://webpki.github.io/keygen2/logotype#application";
       }
 
     public interface CLIENT_ATTRIBUTES
       {
-        String IMEI_NUMBER                 = "http://xmlns.webpki.org/keygen2/clientattr#imei-number";
+        String IMEI_NUMBER                 = "https://webpki.github.io/keygen2/clientattr#imei-number";
   
-        String MAC_ADDRESS                 = "http://xmlns.webpki.org/keygen2/clientattr#mac-address";
+        String MAC_ADDRESS                 = "https://webpki.github.io/keygen2/clientattr#mac-address";
   
-        String IP_ADDRESS                  = "http://xmlns.webpki.org/keygen2/clientattr#ip-address";
+        String IP_ADDRESS                  = "https://webpki.github.io/keygen2/clientattr#ip-address";
 
-        String OS_VENDOR                   = "http://xmlns.webpki.org/keygen2/clientattr#os-vendor";
+        String OS_VENDOR                   = "https://webpki.github.io/keygen2/clientattr#os-vendor";
 
-        String OS_VERSION                  = "http://xmlns.webpki.org/keygen2/clientattr#os-version";
+        String OS_VERSION                  = "https://webpki.github.io/keygen2/clientattr#os-version";
       }
 
     public interface FEATURE
       {
-        String VIRTUAL_MACHINE             = "http://xmlns.webpki.org/keygen2/feature#vm";
+        String VIRTUAL_MACHINE             = "https://webpki.github.io/keygen2/feature#vm";
       }
   }
diff --git a/library/deprecated/org/webpki/kg2xml/test/KeyGen2Test.java b/library/deprecated/org/webpki/kg2xml/test/KeyGen2Test.java
index db5f1675..71fd0349 100644
--- a/library/deprecated/org/webpki/kg2xml/test/KeyGen2Test.java
+++ b/library/deprecated/org/webpki/kg2xml/test/KeyGen2Test.java
@@ -316,7 +316,7 @@ static class KeyCreator
       {
         private static final String kg2keycre = 
           "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-          "<KeyCreationRequest " + KeyGen2Constants.KEY_ENTRY_ALGORITHM_ATTR  + "=\"http://xmlns.webpki.org/sks/algorithm#key.1\" " +
+          "<KeyCreationRequest " + KeyGen2Constants.KEY_ENTRY_ALGORITHM_ATTR  + "=\"https://webpki.github.io/sks/algorithm#key.1\" " +
           "ClientSessionID=\"C-139622a0ac98f2f44a35c9753ca\" " +
           "ID=\"S-139622a0a9993085d38d1586b76\" " +
           "SubmitURL=\"http://issuer.example.com/keyinit\" " +
@@ -394,7 +394,7 @@ KeyCreator addKey (AppUsage appUsage)
                .append (appUsage.getProtocolName ())
                .append ("\" ID=\"Key.")
                .append (++keyId)
-               .append ("\" KeyAlgorithm=\"http://xmlns.webpki.org/sks/algorithm#rsa2048\" MAC=\"Jrqigi79Yw6SoLobsBA5S8b74gTKrIJPh3tQRKci33Y=\"/>");
+               .append ("\" KeyAlgorithm=\"https://webpki.github.io/sks/algorithm#rsa2048\" MAC=\"Jrqigi79Yw6SoLobsBA5S8b74gTKrIJPh3tQRKci33Y=\"/>");
             return this;
           }
 
diff --git a/library/generators/org/webpki/keygen2/InvocationRequest.json b/library/generators/org/webpki/keygen2/InvocationRequest.json
index 90f674a7..28db2fa1 100644
--- a/library/generators/org/webpki/keygen2/InvocationRequest.json
+++ b/library/generators/org/webpki/keygen2/InvocationRequest.json
@@ -1,7 +1,7 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "InvocationRequest",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "action": "manage",
-    "clientCapabilityQuery": ["http://xmlns.webpki.org/keygen2/logotype#list"]
+    "clientCapabilityQuery": ["https://webpki.github.io/keygen2/logotype#list"]
 }
diff --git a/library/generators/org/webpki/keygen2/InvocationResponse.json b/library/generators/org/webpki/keygen2/InvocationResponse.json
index bd40e03a..88709a27 100644
--- a/library/generators/org/webpki/keygen2/InvocationResponse.json
+++ b/library/generators/org/webpki/keygen2/InvocationResponse.json
@@ -1,10 +1,10 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "InvocationResponse",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientCapabilities": 
         [{
-             "type": "http://xmlns.webpki.org/keygen2/logotype#list",
+             "type": "https://webpki.github.io/keygen2/logotype#list",
              "imageAttributes": 
                  {
                      "mimeType": "image/png",
diff --git a/library/generators/org/webpki/keygen2/KeyCreationRequest.json b/library/generators/org/webpki/keygen2/KeyCreationRequest.json
index 2899a979..889439fc 100644
--- a/library/generators/org/webpki/keygen2/KeyCreationRequest.json
+++ b/library/generators/org/webpki/keygen2/KeyCreationRequest.json
@@ -1,9 +1,9 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "KeyCreationRequest",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientSessionId": "39NMWamKtHumJFfdIGkDrLP-NMB-5Lwo",
-    "keyEntryAlgorithm": "http://xmlns.webpki.org/sks/algorithm#key.1",
+    "keyEntryAlgorithm": "https://webpki.github.io/sks/algorithm#key.1",
     "pinPolicySpecifiers": 
         [{
              "id": "PIN.1",
@@ -17,7 +17,7 @@
                  [{
                       "id": "Key.1",
                       "appUsage": "authentication",
-                      "keyAlgorithm": "http://xmlns.webpki.org/sks/algorithm#rsa2048",
+                      "keyAlgorithm": "https://webpki.github.io/sks/algorithm#rsa2048",
                       "mac": "BQpWMwSz4EsYgliHH6RY3UNWuLsR3eJVapY0CYOUTtI"
                   }]
          }]
diff --git a/library/generators/org/webpki/keygen2/KeyCreationResponse.json b/library/generators/org/webpki/keygen2/KeyCreationResponse.json
index 70103528..99410811 100644
--- a/library/generators/org/webpki/keygen2/KeyCreationResponse.json
+++ b/library/generators/org/webpki/keygen2/KeyCreationResponse.json
@@ -1,5 +1,5 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "KeyCreationResponse",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientSessionId": "39NMWamKtHumJFfdIGkDrLP-NMB-5Lwo",
diff --git a/library/generators/org/webpki/keygen2/KeyGen2HTMLReference.java b/library/generators/org/webpki/keygen2/KeyGen2HTMLReference.java
index 00eaaad4..0a602bd9 100644
--- a/library/generators/org/webpki/keygen2/KeyGen2HTMLReference.java
+++ b/library/generators/org/webpki/keygen2/KeyGen2HTMLReference.java
@@ -876,16 +876,6 @@ public static void main(String args[]) throws IOException {
             .newColumn()
             .newColumn()
               .addString("See <code>SKS:createProvisioningSession." + CLIENT_TIME_JSON + "</code>.")
-          .newRow()
-            .newColumn()
-              .addProperty(ATTESTATION_JSON)
-              .addSymbolicValue(ATTESTATION_JSON)
-            .newColumn()
-              .setType(WEBPKI_DATA_TYPES.BYTE_ARRAY)
-            .newColumn()
-            .newColumn()
-              .addString("See <code>SKS:createProvisioningSession." +
-                          ATTESTATION_JSON + "</code>.")
           .newRow()
             .newColumn()
               .addProperty(CLIENT_EPHEMERAL_KEY_JSON)
@@ -907,31 +897,16 @@ public static void main(String args[]) throws IOException {
                           "depending on the value of "))
             .addPropertyLink(PRIVACY_ENABLED_JSON, KeyGen2Messages.INVOCATION_REQUEST.getName())
             .addString(".")
-          .newRow()
+         .newRow()
             .newColumn()
-              .addProperty(SERVER_CERT_FP_JSON)
-              .addSymbolicValue(SERVER_CERT_FP_JSON)
+              .addProperty(ATTESTATION_JSON)
+              .addSymbolicValue(ATTESTATION_JSON)
             .newColumn()
               .setType(WEBPKI_DATA_TYPES.BYTE_ARRAY)
             .newColumn()
-              .setUsage(false)
             .newColumn()
-              .addString("SHA256 fingerprint of the server's certificate during receival of the ")
-              .addLink(KeyGen2Messages.PROVISIONING_INITIALIZATION_REQUEST.getName())
-              .addString(" object. " + LINE_SEPARATOR + 
-                          "This property is mandatory for HTTPS connections.")
-          .newRow()
-            .newColumn()
-              .addProperty(JSONObjectWriter.SIGNATURE_DEFAULT_LABEL_JSON)
-              .addSymbolicValue(JSONObjectWriter.SIGNATURE_DEFAULT_LABEL_JSON)
-            .newColumn()
-              .setType(WEBPKI_DATA_TYPES.OBJECT)
-            .newColumn()
-            .newColumn()
-              .addString("JCS ")
-              .addString(json.createReference(JSONBaseHTML.REF_JCS))
-              .addString(" symmetric key signature covering the entire response." + LINE_SEPARATOR +
-                         "See <code>SKS:signProvisioningSessionData</code>.");
+              .addString("See <code>SKS:createProvisioningSession." +
+                          ATTESTATION_JSON + "</code>.");
 
         preAmble(KeyGen2Messages.CREDENTIAL_DISCOVERY_REQUEST.getName())
           .newExtensionRow(new StandardServerClientSessionIDs())
diff --git a/library/generators/org/webpki/keygen2/ProvisioningFinalizationRequest.json b/library/generators/org/webpki/keygen2/ProvisioningFinalizationRequest.json
index 9fd2b53f..2039428a 100644
--- a/library/generators/org/webpki/keygen2/ProvisioningFinalizationRequest.json
+++ b/library/generators/org/webpki/keygen2/ProvisioningFinalizationRequest.json
@@ -1,5 +1,5 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "ProvisioningFinalizationRequest",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientSessionId": "39NMWamKtHumJFfdIGkDrLP-NMB-5Lwo",
@@ -13,7 +13,7 @@
              "mac": "FkwauPbrrfJZxuEsMkwOFWIIutzdYbEt3P9kr0CG4dc",
              "logotypes": 
                  [{
-                      "type": "http://xmlns.webpki.org/keygen2/logotype#list",
+                      "type": "https://webpki.github.io/keygen2/logotype#list",
                       "mimeType": "image/png",
                       "extensionData": "RBgoJkiaJk_IsZAEZUBsZAEZFg....NVBAMTC0RlbW8gU3ViIENBMBTEzMM1oDTM4",
                       "mac": "uQ5IuLRDpbSkpfU9FHe1grrQ_FXUBfsxsk6HqspjuCU"
diff --git a/library/generators/org/webpki/keygen2/ProvisioningFinalizationResponse.json b/library/generators/org/webpki/keygen2/ProvisioningFinalizationResponse.json
index 060f7ff6..be6db679 100644
--- a/library/generators/org/webpki/keygen2/ProvisioningFinalizationResponse.json
+++ b/library/generators/org/webpki/keygen2/ProvisioningFinalizationResponse.json
@@ -1,5 +1,5 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "ProvisioningFinalizationResponse",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientSessionId": "39NMWamKtHumJFfdIGkDrLP-NMB-5Lwo",
diff --git a/library/generators/org/webpki/keygen2/ProvisioningInitializationRequest.json b/library/generators/org/webpki/keygen2/ProvisioningInitializationRequest.json
index 63bbe9f4..6f71f8ad 100644
--- a/library/generators/org/webpki/keygen2/ProvisioningInitializationRequest.json
+++ b/library/generators/org/webpki/keygen2/ProvisioningInitializationRequest.json
@@ -1,9 +1,9 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "ProvisioningInitializationRequest",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
-    "serverTime": "2017-05-24T16:33:30Z",
-    "sessionKeyAlgorithm": "http://xmlns.webpki.org/sks/algorithm#session.1",
+    "serverTime": "2019-04-08T16:33:30Z",
+    "sessionKeyAlgorithm": "https://webpki.github.io/sks/algorithm#session.1",
     "sessionKeyLimit": 20,
     "sessionLifeTime": 300,
     "serverEphemeralKey": 
diff --git a/library/generators/org/webpki/keygen2/ProvisioningInitializationResponse.json b/library/generators/org/webpki/keygen2/ProvisioningInitializationResponse.json
index 421f4243..bb7d3bcf 100644
--- a/library/generators/org/webpki/keygen2/ProvisioningInitializationResponse.json
+++ b/library/generators/org/webpki/keygen2/ProvisioningInitializationResponse.json
@@ -1,29 +1,21 @@
 {
-    "@context": "http://xmlns.webpki.org/keygen2/beta/20170513",
+    "@context": "https://webpki.github.io/keygen2#20190318",
     "@qualifier": "ProvisioningInitializationResponse",
     "serverSessionId": "142f1bdb286XVQnqmIRc1bSzm-QN-ZJk",
     "clientSessionId": "39NMWamKtHumJFfdIGkDrLP-NMB-5Lwo",
-    "serverTime": "2017-05-24T16:33:30Z",
-    "clientTime": "2017-05-24T18:33:36+02:00",
-    "clientEphemeralKey": 
-        {
+    "serverTime": "2019-04-08T16:33:30Z",
+    "clientTime": "2019-04-08T18:33:36+02:00",
+    "clientEphemeralKey": {
             "kty": "EC", 
             "crv": "P-256",
             "x": "tQXczn7qxGgcLpOVBuw5i-tMHxbJTUF6k3RZGsjdauc",
             "y": "jIlm8sXwknZeQQDTxkfwXKUdhubt6JcqQYA6S8Dm3AE"
-        },
-    "deviceId": 
-        {
+    },
+    "deviceId": {
             "certificatePath": 
                 [
                     "MIIC2DCCAcCgAwIBAgIGARTWcc7VMCSq....awCV4OfAGXLIwJBCp85AN7KNdcJfL"
                 ]
-        },
-    "attestation": "KMUpOesC8nDTLpu8PppsSGg1j....WiwvUcVpbNudbY14lLks8RQuwoiU",
-    "serverCertificateFingerPrint": "HwKCofkqkTFXRmyyb_CnWhAcTbQF7w8rl1OqCwyM4TM",
-    "signature": 
-        {
-            "algorithm": "HS256",
-            "value": "nnzNSZUZw1qlGVydZZ3ssCVIZTznyHwDXlOpLMpI3Lo"
-        }
+    },
+    "attestation": "KMUpOesC8nDTLpu8PppsSGg1j....WiwvUcVpbNudbY14lLks8RQuwoiU"
 }
\ No newline at end of file
diff --git a/library/sks-ws-descriptor.xml b/library/sks-ws-descriptor.xml
index d4333703..8b6974d2 100644
--- a/library/sks-ws-descriptor.xml
+++ b/library/sks-ws-descriptor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- SKS WS Descriptor File to be used with "WSCreator" -->
-<WebService NameSpace="http://xmlns.webpki.org/sks/v1.00"
+<WebService NameSpace="https://webpki.github.io/sks/v1.00"
             Service="SKSWS"
             DefaultURL="http://localhost:9982/securekeystore"
             WSDLLocation="META-INF/SKSWS.wsdl"
@@ -25,8 +25,8 @@
 ]]></LicenseHeader>
 
    <GlobalClientConstants>
-      <Constant Name="ALGORITHM_SESSION_KEY_ATTEST_1" Type="string" Value="http://xmlns.webpki.org/keygen2/1.0#algorithm.sks.s1"/>
-      <Constant Name="ALGORITHM_KEY_ATTEST_1"         Type="string" Value="http://xmlns.webpki.org/keygen2/1.0#algorithm.sks.k1"/>
+      <Constant Name="ALGORITHM_SESSION_KEY_ATTEST_1" Type="string" Value="https://webpki.github.io/keygen2/1.0#algorithm.sks.s1"/>
+      <Constant Name="ALGORITHM_KEY_ATTEST_1"         Type="string" Value="https://webpki.github.io/keygen2/1.0#algorithm.sks.k1"/>
    </GlobalClientConstants>
 
    <JavaServer ClassName="org.webpki.sks.ws.server.SKSWSImplementation"
@@ -527,6 +527,7 @@
      <Parameter Name="client_time"           Type="int"    XMLName="ClientTime"/>
      <Parameter Name="session_life_time"     Type="int"    XMLName="SessionLifeTime"/>
      <Parameter Name="session_key_limit"     Type="short"  XMLName="SessionKeyLimit"/>
+     <Parameter Name="server_certificate"    Type="binary" XMLName="ServerCertificate"/>
      <Parameter Name="client_session_id"     Type="string" XMLName="ClientSessionID"       Mode="out"/>
      <Parameter Name="client_ephemeral_key"  Type="binary" XMLName="ClientEphemeralKey"    Mode="out" RewriteRule="Out.ECPublicKey"/>
      <Parameter Name="attestation"           Type="binary" XMLName="Attestation"           Mode="out"/>
@@ -542,7 +543,8 @@
                                                                                         key_management_key == null ? null : createPublicKeyFromBlob (key_management_key),
                                                                                         client_time,
                                                                                         session_life_time,
-                                                                                        session_key_limit);
+                                                                                        session_key_limit,
+                                                                                        server_certificate);
             client_session_id.value = sess.getClientSessionId ();
             client_ephemeral_key.value = sess.getClientEphemeralKey ().getEncoded ();
             attestation.value = sess.getAttestation ();
@@ -650,16 +652,6 @@
           }
 ]]></Code></Method>
 
-   <Method Name="signProvisioningSessionData" Throws="SKSException">
-     <Returns   Name="signature"           Type="binary" XMLName="Signature"/>
-     <Parameter Name="device_id"           Type="string" XMLName="DeviceID"           Null="true" SuppressRule="DEV"/>
-     <Parameter Name="provisioning_handle" Type="int"    XMLName="ProvisioningHandle"/>
-     <Parameter Name="data"                Type="binary" XMLName="Data"               />
-     <Code><![CDATA[
-        log (device_id, "signProvisioningSessionData (ProvisioningHandle=" + provisioning_handle + ")");
-        return getDevice (device_id).signProvisioningSessionData (provisioning_handle, data);
-]]></Code></Method>
-
    <Method Name="createPukPolicy" Throws="SKSException">
      <Returns   Name="puk_policy_handle"   Type="int"    XMLName="PukPolicyHandle"/>
      <Parameter Name="device_id"           Type="string" XMLName="DeviceID"           Null="true" SuppressRule="DEV"/>
diff --git a/library/sks-ws-dotnet/client/SKSWSProxy.cs b/library/sks-ws-dotnet/client/SKSWSProxy.cs
index 80cdfe22..f71f0a4a 100644
--- a/library/sks-ws-dotnet/client/SKSWSProxy.cs
+++ b/library/sks-ws-dotnet/client/SKSWSProxy.cs
@@ -28,7 +28,7 @@ namespace org.webpki.sks.ws.client
     /*
      *  This is the .NET SKS WS client.
      */
-    [System.ServiceModel.ServiceContractAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00")]
+    [System.ServiceModel.ServiceContractAttribute(Namespace="https://webpki.github.io/sks/v1.00")]
     public interface SKSWSProxyInterface
     {
         [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
@@ -56,11 +56,6 @@ public interface SKSWSProxyInterface
         [System.ServiceModel.XmlSerializerFormatAttribute()]
         abortProvisioningSession_Response abortProvisioningSession(abortProvisioningSession_Request request);
 
-        [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
-        [System.ServiceModel.FaultContractAttribute(typeof(_SKSException), Action="", Name="SKSException")]
-        [System.ServiceModel.XmlSerializerFormatAttribute()]
-        signProvisioningSessionData_Response signProvisioningSessionData(signProvisioningSessionData_Request request);
-
         [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")]
         [System.ServiceModel.FaultContractAttribute(typeof(_SKSException), Action="", Name="SKSException")]
         [System.ServiceModel.XmlSerializerFormatAttribute()]
@@ -358,10 +353,10 @@ public enum BiometricProtection : sbyte
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getDeviceInfo", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getDeviceInfo", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getDeviceInfo_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
@@ -372,76 +367,76 @@ public getDeviceInfo_Request(string DeviceID)
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getDeviceInfo.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getDeviceInfo.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class DeviceInfo
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="APILevel", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _api_level;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceType", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _device_type;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="UpdateURL", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _update_url;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="VendorName", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _vendor_name;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="VendorDescription", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _vendor_description;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="X509Certificate", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<byte[]> _certificate_path;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SupportedAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<string> _supported_algorithms;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="CryptoDataSize", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _crypto_data_size;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExtensionDataSize", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _extension_data_size;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=9)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=9)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DevicePINSupport", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _device_pin_support;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=10)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=10)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="BiometricSupport", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _biometric_support;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=11)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=11)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ConnectionPort", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _connection_port;
@@ -531,49 +526,53 @@ public string ConnectionPort
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createProvisioningSession", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createProvisioningSession", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createProvisioningSession_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SessionKeyAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _session_key_algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PrivacyEnabled", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _privacy_enabled;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ServerSessionID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _server_session_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ServerEphemeralKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _server_ephemeral_key;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="IssuerURI", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _issuer_uri;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyManagementKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _key_management_key;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ClientTime", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _client_time;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SessionLifeTime", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _session_life_time;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=9)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=9)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SessionKeyLimit", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal short _session_key_limit;
 
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=10)]
+        [System.Xml.Serialization.XmlElementAttribute(ElementName="ServerCertificate", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
+        internal byte[] _server_certificate;
+
         public createProvisioningSession_Request(string DeviceID,
                                                  string SessionKeyAlgorithm,
                                                  bool PrivacyEnabled,
@@ -583,7 +582,8 @@ public class createProvisioningSession_Request
                                                  byte[] KeyManagementKey,
                                                  int ClientTime,
                                                  int SessionLifeTime,
-                                                 short SessionKeyLimit)
+                                                 short SessionKeyLimit,
+                                                 byte[] ServerCertificate)
         {
             _device_id = DeviceID;
             _session_key_algorithm = SessionKeyAlgorithm;
@@ -595,32 +595,33 @@ public class createProvisioningSession_Request
             _client_time = ClientTime;
             _session_life_time = SessionLifeTime;
             _session_key_limit = SessionKeyLimit;
+            _server_certificate = ServerCertificate;
         }
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createProvisioningSession.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createProvisioningSession.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class ProvisioningSession
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _provisioning_handle;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ClientSessionID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _client_session_id;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ClientEphemeralKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _client_ephemeral_key;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Attestation", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _attestation;
@@ -650,22 +651,22 @@ public byte[] Attestation
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="closeProvisioningSession", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="closeProvisioningSession", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class closeProvisioningSession_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Nonce", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _nonce;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -682,10 +683,10 @@ public class closeProvisioningSession_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="closeProvisioningSession.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="closeProvisioningSession.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class closeProvisioningSession_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="CloseAttestation", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _close_attestation;
@@ -693,18 +694,18 @@ public class closeProvisioningSession_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateProvisioningSessions", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateProvisioningSessions", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class enumerateProvisioningSessions_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningState", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _provisioning_state;
 
@@ -719,58 +720,58 @@ public class enumerateProvisioningSessions_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateProvisioningSessions.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateProvisioningSessions.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class EnumeratedProvisioningSession
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _provisioning_handle;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SessionKeyAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _session_key_algorithm;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PrivacyEnabled", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _privacy_enabled;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyManagementKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _key_management_key;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ClientTime", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _client_time;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SessionLifeTime", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _session_life_time;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ServerSessionID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _server_session_id;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ClientSessionID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _client_session_id;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="IssuerURI", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _issuer_uri;
@@ -823,14 +824,14 @@ public string IssuerURI
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="abortProvisioningSession", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="abortProvisioningSession", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class abortProvisioningSession_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
@@ -843,77 +844,40 @@ public class abortProvisioningSession_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="abortProvisioningSession.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="abortProvisioningSession.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class abortProvisioningSession_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="signProvisioningSessionData", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
-    public class signProvisioningSessionData_Request
-    {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
-        internal string _device_id;
-
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
-        [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
-        internal int _provisioning_handle;
-
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
-        [System.Xml.Serialization.XmlElementAttribute(ElementName="Data", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
-        internal byte[] _data;
-
-        public signProvisioningSessionData_Request(string DeviceID,
-                                                   int ProvisioningHandle,
-                                                   byte[] Data)
-        {
-            _device_id = DeviceID;
-            _provisioning_handle = ProvisioningHandle;
-            _data = Data;
-        }
-    }
-
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="signProvisioningSessionData.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
-    public class signProvisioningSessionData_Response
-    {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
-        [System.Xml.Serialization.XmlElementAttribute(ElementName="Signature", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
-        #pragma warning disable 0649
-        internal byte[] _signature;
-        #pragma warning restore 0649
-    }
-
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createPukPolicy", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createPukPolicy", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createPukPolicy_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EncryptedPuk", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _encrypted_puk;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Format", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _format;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="RetryLimit", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal short _retry_limit;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -936,10 +900,10 @@ public class createPukPolicy_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createPukPolicy.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createPukPolicy.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createPukPolicy_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PukPolicyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _puk_policy_handle;
@@ -947,62 +911,62 @@ public class createPukPolicy_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createPinPolicy", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createPinPolicy", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createPinPolicy_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PukPolicyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _puk_policy_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="UserDefined", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _user_defined;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="UserModifiable", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _user_modifiable;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Format", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _format;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="RetryLimit", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal short _retry_limit;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Grouping", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _grouping;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=9)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=9)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PatternRestrictions", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _pattern_restrictions;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=10)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=10)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MinLength", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal short _min_length;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=11)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=11)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MaxLength", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal short _max_length;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=12)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=12)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="InputMethod", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _input_method;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=13)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=13)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1039,10 +1003,10 @@ public class createPinPolicy_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createPinPolicy.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createPinPolicy.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createPinPolicy_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PINPolicyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _pin_policy_handle;
@@ -1050,78 +1014,78 @@ public class createPinPolicy_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createKeyEntry", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createKeyEntry", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class createKeyEntry_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyEntryAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _key_entry_algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ServerSeed", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _server_seed;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DevicePinProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _device_pin_protection;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PinPolicyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _pin_policy_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PinValue", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _pin_value;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EnablePinCaching", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _enable_pin_caching;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=9)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=9)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="BiometricProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _biometric_protection;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=10)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=10)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExportProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _export_protection;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=11)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=11)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeleteProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _delete_protection;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=12)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=12)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="AppUsage", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _app_usage;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=13)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=13)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="FriendlyName", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _friendly_name;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=14)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=14)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _key_algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=15)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=15)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyParameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _key_parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=16)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=16)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EndorsedAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal List<string> _endorsed_algorithms;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=17)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=17)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1166,22 +1130,22 @@ public class createKeyEntry_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="createKeyEntry.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="createKeyEntry.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class KeyData
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _key_handle;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PublicKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _public_key;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Attestation", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _attestation;
@@ -1206,18 +1170,18 @@ public byte[] Attestation
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyHandle", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyHandle", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getKeyHandle_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _id;
 
@@ -1232,10 +1196,10 @@ public class getKeyHandle_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyHandle.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyHandle.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getKeyHandle_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _key_handle;
@@ -1243,22 +1207,22 @@ public class getKeyHandle_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setCertificatePath", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setCertificatePath", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setCertificatePath_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="X509Certificate", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal List<byte[]> _certificate_path;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1275,28 +1239,28 @@ public class setCertificatePath_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setCertificatePath.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setCertificatePath.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setCertificatePath_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="importSymmetricKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="importSymmetricKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class importSymmetricKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EncryptedKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _encrypted_key;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1313,28 +1277,28 @@ public class importSymmetricKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="importSymmetricKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="importSymmetricKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class importSymmetricKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="importPrivateKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="importPrivateKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class importPrivateKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EncryptedKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _encrypted_key;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1351,40 +1315,40 @@ public class importPrivateKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="importPrivateKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="importPrivateKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class importPrivateKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="addExtension", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="addExtension", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class addExtension_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Type", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _type;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SubType", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal sbyte _sub_type;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Qualifier", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _qualifier;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExtensionData", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _extension_data;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1407,32 +1371,32 @@ public class addExtension_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="addExtension.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="addExtension.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class addExtension_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postDeleteKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postDeleteKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postDeleteKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TargetKeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _target_key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1451,32 +1415,32 @@ public class postDeleteKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postDeleteKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postDeleteKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postDeleteKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postUnlockKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postUnlockKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postUnlockKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TargetKeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _target_key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1495,32 +1459,32 @@ public class postUnlockKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postUnlockKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postUnlockKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postUnlockKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postUpdateKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postUpdateKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postUpdateKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TargetKeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _target_key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1539,32 +1503,32 @@ public class postUpdateKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postUpdateKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postUpdateKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postUpdateKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postCloneKeyProtection", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postCloneKeyProtection", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postCloneKeyProtection_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TargetKeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _target_key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MAC", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _mac;
 
@@ -1583,20 +1547,20 @@ public class postCloneKeyProtection_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="postCloneKeyProtection.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="postCloneKeyProtection.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class postCloneKeyProtection_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateKeys", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateKeys", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class enumerateKeys_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
@@ -1609,16 +1573,16 @@ public class enumerateKeys_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateKeys.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="enumerateKeys.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class EnumeratedKey
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _key_handle;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal int _provisioning_handle;
@@ -1636,22 +1600,22 @@ public int ProvisioningHandle
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="updateKeyManagementKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="updateKeyManagementKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class updateKeyManagementKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProvisioningHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _provisioning_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyManagementKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _key_management_key;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Attestation", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _attestation;
 
@@ -1668,20 +1632,20 @@ public class updateKeyManagementKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="updateKeyManagementKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="updateKeyManagementKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class updateKeyManagementKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyAttributes", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyAttributes", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getKeyAttributes_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
@@ -1694,40 +1658,40 @@ public class getKeyAttributes_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyAttributes.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyAttributes.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class KeyAttributes
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SymmetricKeyLength", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _symmetric_key_length;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="X509Certificate", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<byte[]> _certificate_path;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="AppUsage", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _app_usage;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="FriendlyName", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _friendly_name;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EndorsedAlgorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<string> _endorsed_algorithms;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExtensionType", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<string> _extension_types;
@@ -1767,14 +1731,14 @@ public string[] ExtensionTypes
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyProtectionInfo", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyProtectionInfo", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getKeyProtectionInfo_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
@@ -1787,118 +1751,118 @@ public class getKeyProtectionInfo_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyProtectionInfo.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getKeyProtectionInfo.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class KeyProtectionInfo
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ProtectionStatus", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _protection_status;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PukFormat", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _puk_format;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PukRetryLimit", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _puk_retry_limit;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PukErrorCount", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _puk_error_count;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="UserDefined", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _user_defined;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="UserModifiable", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _user_modifiable;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Format", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _format;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="RetryLimit", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _retry_limit;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=8)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=8)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Grouping", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _grouping;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=9)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=9)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PatternRestrictions", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _pattern_restrictions;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=10)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=10)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MinLength", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _min_length;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=11)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=11)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="MaxLength", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _max_length;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=12)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=12)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="InputMethod", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _input_method;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=13)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=13)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PinErrorCount", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal short _pin_error_count;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=14)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=14)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="EnablePinCaching", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal bool _enable_pin_caching;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=15)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=15)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="BiometricProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _biometric_protection;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=16)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=16)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExportProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _export_protection;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=17)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=17)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeleteProtection", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _delete_protection;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=18)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=18)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyBackup", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _key_backup;
@@ -2017,18 +1981,18 @@ public sbyte KeyBackup
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getExtension", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getExtension", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getExtension_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Type", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _type;
 
@@ -2043,22 +2007,22 @@ public class getExtension_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getExtension.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getExtension.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class Extension
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="SubType", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal sbyte _sub_type;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Qualifier", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _qualifier;
         #pragma warning restore 0649
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="ExtensionData", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _extension_data;
@@ -2083,26 +2047,26 @@ public byte[] ExtensionData
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setProperty", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setProperty", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setProperty_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Type", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _type;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Name", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _name;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Value", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _value;
 
@@ -2121,24 +2085,24 @@ public class setProperty_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setProperty.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setProperty.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setProperty_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="deleteKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="deleteKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class deleteKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
@@ -2153,24 +2117,24 @@ public class deleteKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="deleteKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="deleteKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class deleteKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="exportKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="exportKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class exportKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
@@ -2185,10 +2149,10 @@ public class exportKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="exportKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="exportKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class exportKey_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Key", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _key;
@@ -2196,18 +2160,18 @@ public class exportKey_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="unlockKey", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="unlockKey", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class unlockKey_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
@@ -2222,28 +2186,28 @@ public class unlockKey_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="unlockKey.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="unlockKey.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class unlockKey_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="changePin", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="changePin", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class changePin_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="NewPin", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _new_pin;
 
@@ -2260,28 +2224,28 @@ public class changePin_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="changePin.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="changePin.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class changePin_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setPin", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setPin", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setPin_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="NewPin", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _new_pin;
 
@@ -2298,40 +2262,40 @@ public class setPin_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="setPin.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="setPin.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class setPin_Response
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="signHashedData", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="signHashedData", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class signHashedData_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Algorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Parameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TrustedGUIAuthorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _trusted_gui_authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Data", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _data;
 
@@ -2354,10 +2318,10 @@ public class signHashedData_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="signHashedData.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="signHashedData.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class signHashedData_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Result", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _result;
@@ -2365,34 +2329,34 @@ public class signHashedData_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="asymmetricKeyDecrypt", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="asymmetricKeyDecrypt", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class asymmetricKeyDecrypt_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Algorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Parameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TrustedGUIAuthorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _trusted_gui_authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Data", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _data;
 
@@ -2415,10 +2379,10 @@ public class asymmetricKeyDecrypt_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="asymmetricKeyDecrypt.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="asymmetricKeyDecrypt.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class asymmetricKeyDecrypt_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Result", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _result;
@@ -2426,34 +2390,34 @@ public class asymmetricKeyDecrypt_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="keyAgreement", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="keyAgreement", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class keyAgreement_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Algorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Parameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TrustedGUIAuthorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _trusted_gui_authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="PublicKey", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _public_key;
 
@@ -2476,10 +2440,10 @@ public class keyAgreement_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="keyAgreement.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="keyAgreement.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class keyAgreement_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Result", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _result;
@@ -2487,34 +2451,34 @@ public class keyAgreement_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="performHmac", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="performHmac", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class performHmac_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Algorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Parameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TrustedGUIAuthorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _trusted_gui_authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Data", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _data;
 
@@ -2537,10 +2501,10 @@ public class performHmac_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="performHmac.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="performHmac.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class performHmac_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Result", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _result;
@@ -2548,38 +2512,38 @@ public class performHmac_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="symmetricKeyEncrypt", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="symmetricKeyEncrypt", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class symmetricKeyEncrypt_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="KeyHandle", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal int _key_handle;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=2)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=2)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Algorithm", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _algorithm;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=3)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=3)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Mode", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _mode;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=4)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=4)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Parameters", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _parameters;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=5)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=5)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="TrustedGUIAuthorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal bool _trusted_gui_authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=6)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=6)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Authorization", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _authorization;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=7)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=7)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Data", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _data;
 
@@ -2604,10 +2568,10 @@ public class symmetricKeyEncrypt_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="symmetricKeyEncrypt.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="symmetricKeyEncrypt.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class symmetricKeyEncrypt_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Result", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal byte[] _result;
@@ -2615,14 +2579,14 @@ public class symmetricKeyEncrypt_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="updateFirmware", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="updateFirmware", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class updateFirmware_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _device_id;
 
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=1)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=1)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Chunk", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal byte[] _chunk;
 
@@ -2635,10 +2599,10 @@ public class updateFirmware_Request
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="updateFirmware.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="updateFirmware.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class updateFirmware_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="NextURL", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _next_url;
@@ -2646,16 +2610,16 @@ public class updateFirmware_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="listDevices", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="listDevices", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class listDevices_Request
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="listDevices.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="listDevices.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class listDevices_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="DeviceID", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal List<string> _devices;
@@ -2663,16 +2627,16 @@ public class listDevices_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getVersion", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getVersion", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getVersion_Request
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="getVersion.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="getVersion.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class getVersion_Response
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Version", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         #pragma warning disable 0649
         internal string _version;
@@ -2680,10 +2644,10 @@ public class getVersion_Response
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="logEvent", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="logEvent", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class logEvent_Request
     {
-        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://xmlns.webpki.org/sks/v1.00", Order=0)]
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="https://webpki.github.io/sks/v1.00", Order=0)]
         [System.Xml.Serialization.XmlElementAttribute(ElementName="Description", Form=System.Xml.Schema.XmlSchemaForm.Qualified)]
         internal string _description;
 
@@ -2694,16 +2658,16 @@ public logEvent_Request(string Description)
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ServiceModel.MessageContractAttribute(WrapperName="logEvent.Response", WrapperNamespace="http://xmlns.webpki.org/sks/v1.00", IsWrapped=true)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="logEvent.Response", WrapperNamespace="https://webpki.github.io/sks/v1.00", IsWrapped=true)]
     public class logEvent_Response
     {
     }
 
     public partial class SKSWSProxy : System.ServiceModel.ClientBase<SKSWSProxyInterface>
     {
-        public const string ALGORITHM_SESSION_KEY_ATTEST_1 = "http://xmlns.webpki.org/keygen2/1.0#algorithm.sks.s1";
+        public const string ALGORITHM_SESSION_KEY_ATTEST_1 = "https://webpki.github.io/keygen2/1.0#algorithm.sks.s1";
 
-        public const string ALGORITHM_KEY_ATTEST_1 = "http://xmlns.webpki.org/keygen2/1.0#algorithm.sks.k1";
+        public const string ALGORITHM_KEY_ATTEST_1 = "https://webpki.github.io/keygen2/1.0#algorithm.sks.k1";
 
         public static SKSWSProxy getDefaultSKSWSProxy()
         {
@@ -2749,7 +2713,8 @@ public DeviceInfo getDeviceInfo()
                                                              PublicKey KeyManagementKey,
                                                              int ClientTime,
                                                              int SessionLifeTime,
-                                                             short SessionKeyLimit)
+                                                             short SessionKeyLimit,
+                                                             byte[] ServerCertificate)
         {
             try
             {
@@ -2762,7 +2727,8 @@ public DeviceInfo getDeviceInfo()
                                                                                                     Conversions.EncodeX509PublicKey(KeyManagementKey),
                                                                                                     ClientTime,
                                                                                                     SessionLifeTime,
-                                                                                                    SessionKeyLimit));
+                                                                                                    SessionKeyLimit,
+                                                                                                    ServerCertificate));
             }
             catch (System.ServiceModel.FaultException<_SKSException> e)
             {
@@ -2816,21 +2782,6 @@ public void abortProvisioningSession(int ProvisioningHandle)
             }
         }
 
-        public byte[] signProvisioningSessionData(int ProvisioningHandle,
-                                                  byte[] Data)
-        {
-            try
-            {
-                return base.Channel.signProvisioningSessionData(new signProvisioningSessionData_Request(device_id,
-                                                                                                        ProvisioningHandle,
-                                                                                                        Data))._signature;
-            }
-            catch (System.ServiceModel.FaultException<_SKSException> e)
-            {
-                throw new SKSException(e);
-            }
-        }
-
         public int createPukPolicy(int ProvisioningHandle,
                                    string ID,
                                    byte[] EncryptedPuk,
diff --git a/library/sks-ws-dotnet/doc/index.html b/library/sks-ws-dotnet/doc/index.html
index e4d7e91c..4c129a82 100644
--- a/library/sks-ws-dotnet/doc/index.html
+++ b/library/sks-ws-dotnet/doc/index.html
@@ -1 +1 @@
-<html><body><table cellpadding="20" border="0"><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;DeviceInfo&nbsp;getDeviceInfo&nbsp;(</code></td><td><code>)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;ProvisioningSession&nbsp;createProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;SessionKeyAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;PrivacyEnabled,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ServerSessionID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;ServerEphemeralKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;IssuerURI,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;KeyManagementKey,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ClientTime,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;SessionLifeTime,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;SessionKeyLimit)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;closeProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Nonce,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;EnumeratedProvisioningSession&nbsp;enumerateProvisioningSessions&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;ProvisioningState)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;abortProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;signProvisioningSessionData&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;createPukPolicy&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedPuk,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PassphraseFormat</font>&nbsp;Format,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;RetryLimit,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;createPinPolicy&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;PukPolicyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;UserDefined,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;UserModifiable,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PassphraseFormat</font>&nbsp;Format,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;RetryLimit,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">Grouping</font>&nbsp;Grouping,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">HashSet<PatternRestriction></font>&nbsp;PatternRestrictions,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;MinLength,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;MaxLength,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">InputMethod</font>&nbsp;InputMethod,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyData&nbsp;createKeyEntry&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;KeyEntryAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;ServerSeed,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;DevicePinProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;PinPolicyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;PinValue,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;EnablePinCaching,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">BiometricProtection</font>&nbsp;BiometricProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">ExportProtection</font>&nbsp;ExportProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">DeleteProtection</font>&nbsp;DeleteProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">AppUsage</font>&nbsp;AppUsage,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;FriendlyName,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;KeyAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;KeyParameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>[]&nbsp;EndorsedAlgorithms,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;getKeyHandle&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setCertificatePath&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">X509Certificate2</font>[]&nbsp;CertificatePath,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;importSymmetricKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;importPrivateKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;addExtension&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">sbyte</font>&nbsp;SubType,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Qualifier,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;ExtensionData,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postDeleteKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postUnlockKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postUpdateKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postCloneKeyProtection&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;EnumeratedKey&nbsp;enumerateKeys&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;updateKeyManagementKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;KeyManagementKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Attestation)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyAttributes&nbsp;getKeyAttributes&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyProtectionInfo&nbsp;getKeyProtectionInfo&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;Extension&nbsp;getExtension&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setProperty&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Name,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Value)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;deleteKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;exportKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;unlockKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;changePin&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;NewPin)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setPin&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;NewPin)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;signHashedData&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;asymmetricKeyDecrypt&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;keyAgreement&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;PublicKey)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;performHmac&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;symmetricKeyEncrypt&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;Mode,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">string</font>&nbsp;updateFirmware&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Chunk)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3">May&nbsp;be&nbsp;null:&nbsp;<code>return&nbsp;value</code></td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">string</font>[]&nbsp;listDevices&nbsp;(</code></td><td><code>)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr></table></body></html>
\ No newline at end of file
+<html><body><table cellpadding="20" border="0"><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;DeviceInfo&nbsp;getDeviceInfo&nbsp;(</code></td><td><code>)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;ProvisioningSession&nbsp;createProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;SessionKeyAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;PrivacyEnabled,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ServerSessionID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;ServerEphemeralKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;IssuerURI,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;KeyManagementKey,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ClientTime,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;SessionLifeTime,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;SessionKeyLimit,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;ServerCertificate)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;closeProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Nonce,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;EnumeratedProvisioningSession&nbsp;enumerateProvisioningSessions&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;ProvisioningState)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;abortProvisioningSession&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;createPukPolicy&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedPuk,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PassphraseFormat</font>&nbsp;Format,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;RetryLimit,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;createPinPolicy&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;PukPolicyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;UserDefined,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;UserModifiable,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PassphraseFormat</font>&nbsp;Format,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;RetryLimit,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">Grouping</font>&nbsp;Grouping,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">HashSet<PatternRestriction></font>&nbsp;PatternRestrictions,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;MinLength,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">short</font>&nbsp;MaxLength,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">InputMethod</font>&nbsp;InputMethod,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyData&nbsp;createKeyEntry&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;KeyEntryAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;ServerSeed,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;DevicePinProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;PinPolicyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;PinValue,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;EnablePinCaching,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">BiometricProtection</font>&nbsp;BiometricProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">ExportProtection</font>&nbsp;ExportProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">DeleteProtection</font>&nbsp;DeleteProtection,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">AppUsage</font>&nbsp;AppUsage,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;FriendlyName,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;KeyAlgorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;KeyParameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>[]&nbsp;EndorsedAlgorithms,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">int</font>&nbsp;getKeyHandle&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;ID)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setCertificatePath&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">X509Certificate2</font>[]&nbsp;CertificatePath,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;importSymmetricKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;importPrivateKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;EncryptedKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;addExtension&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">sbyte</font>&nbsp;SubType,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Qualifier,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;ExtensionData,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postDeleteKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postUnlockKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postUpdateKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;postCloneKeyProtection&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;TargetKeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;MAC)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;EnumeratedKey&nbsp;enumerateKeys&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;updateKeyManagementKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;ProvisioningHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;KeyManagementKey,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Attestation)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyAttributes&nbsp;getKeyAttributes&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;KeyProtectionInfo&nbsp;getKeyProtectionInfo&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;Extension&nbsp;getExtension&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setProperty&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Type,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Name,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Value)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;deleteKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;exportKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;unlockKey&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;changePin&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;NewPin)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">void</font>&nbsp;setPin&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;NewPin)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;signHashedData&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;asymmetricKeyDecrypt&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;keyAgreement&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="green">PublicKey</font>&nbsp;PublicKey)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;performHmac&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">byte</font>[]&nbsp;symmetricKeyEncrypt&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">int</font>&nbsp;KeyHandle,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">string</font>&nbsp;Algorithm,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">bool</font>&nbsp;Mode,</code></td><td><code></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Parameters,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Authorization,</code></td><td><code>&nbsp;<font color="grey">// May be null</font></code></td></tr><tr><td>&nbsp;</td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Data)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">string</font>&nbsp;updateFirmware&nbsp;(</code></td><td><code><font color="blue"></font><font color="blue">byte</font>[]&nbsp;Chunk)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3">May&nbsp;be&nbsp;null:&nbsp;<code>return&nbsp;value</code></td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr><tr><td>&nbsp;</td></tr><tr><td style="border-width:1px 1px 1px 1px;border-style:solid;border-color:black"><table cellpadding="0" cellspacing="0" border="0"><tr><td><code><font color="blue">public</font>&nbsp;<font color="blue">string</font>[]&nbsp;listDevices&nbsp;(</code></td><td><code>)</code></td><td><code></code></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="2">Throws:&nbsp;<code>SKSException</code></td></tr></table></td></tr></table></body></html>
\ No newline at end of file
diff --git a/library/src/org/webpki/crypto/AsymEncryptionAlgorithms.java b/library/src/org/webpki/crypto/AsymEncryptionAlgorithms.java
index 573a86b4..27e4b748 100644
--- a/library/src/org/webpki/crypto/AsymEncryptionAlgorithms.java
+++ b/library/src/org/webpki/crypto/AsymEncryptionAlgorithms.java
@@ -21,17 +21,17 @@
 
 public enum AsymEncryptionAlgorithms implements EncryptionAlgorithms {
 
-    RSA_ES_PKCS_1_5        ("http://xmlns.webpki.org/sks/algorithm#rsa.es.pkcs1_5",
+    RSA_ES_PKCS_1_5        ("https://webpki.github.io/sks/algorithm#rsa.es.pkcs1_5",
                             null,
                             "1.2.840.113549.1.1.1",
                             "RSA/ECB/PKCS1Padding"),
     
-    RSA_OAEP_SHA1_MGF1P    ("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha1",
+    RSA_OAEP_SHA1_MGF1P    ("https://webpki.github.io/sks/algorithm#rsa.oaep.sha1",
                             "RSA-OAEP",
                             null,
                             "RSA/ECB/OAEPWithSHA-1AndMGF1Padding"),
     
-    RSA_OAEP_SHA256_MGF1P  ("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha256",
+    RSA_OAEP_SHA256_MGF1P  ("https://webpki.github.io/sks/algorithm#rsa.oaep.sha256",
                             "RSA-OAEP-256",
                             null,                            
                             "RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
diff --git a/library/src/org/webpki/crypto/AsymSignatureAlgorithms.java b/library/src/org/webpki/crypto/AsymSignatureAlgorithms.java
index c82f3a76..ae6f2356 100644
--- a/library/src/org/webpki/crypto/AsymSignatureAlgorithms.java
+++ b/library/src/org/webpki/crypto/AsymSignatureAlgorithms.java
@@ -20,7 +20,7 @@
 
 public enum AsymSignatureAlgorithms implements SignatureAlgorithms {
 
-    RSA_NONE     ("http://xmlns.webpki.org/sks/algorithm#rsa.pkcs1.none", null,
+    RSA_NONE     ("https://webpki.github.io/sks/algorithm#rsa.pkcs1.none", null,
                   null,                    "NONEwithRSA",     null,                  true,  true),
       
     RSA_SHA1     ("http://www.w3.org/2000/09/xmldsig#rsa-sha1",           null,              
@@ -35,7 +35,7 @@ public enum AsymSignatureAlgorithms implements SignatureAlgorithms {
     RSA_SHA512   ("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512",    "RS512",   
                   "1.2.840.113549.1.1.13", "SHA512withRSA",   HashAlgorithms.SHA512, true,  true),
       
-    ECDSA_NONE   ("http://xmlns.webpki.org/sks/algorithm#ecdsa.none",     null,
+    ECDSA_NONE   ("https://webpki.github.io/sks/algorithm#ecdsa.none",     null,
                   null,                    "NONEwithECDSA",   null,                  true,  false),
       
     ECDSA_SHA256 ("http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256",  "ES256",  
diff --git a/library/src/org/webpki/crypto/KeyAlgorithms.java b/library/src/org/webpki/crypto/KeyAlgorithms.java
index 91f587b3..320d8ebd 100644
--- a/library/src/org/webpki/crypto/KeyAlgorithms.java
+++ b/library/src/org/webpki/crypto/KeyAlgorithms.java
@@ -32,7 +32,7 @@
 
 public enum KeyAlgorithms implements CryptoAlgorithms {
 
-    RSA1024     ("http://xmlns.webpki.org/sks/algorithm#rsa1024", null,
+    RSA1024     ("https://webpki.github.io/sks/algorithm#rsa1024", null,
                 "RSA",
                 1024,
                 AsymSignatureAlgorithms.RSA_SHA256,
@@ -41,7 +41,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA2048     ("http://xmlns.webpki.org/sks/algorithm#rsa2048", null,
+    RSA2048     ("https://webpki.github.io/sks/algorithm#rsa2048", null,
                 "RSA",
                 2048,
                 AsymSignatureAlgorithms.RSA_SHA256,
@@ -50,7 +50,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA3072     ("http://xmlns.webpki.org/sks/algorithm#rsa3072", null,
+    RSA3072     ("https://webpki.github.io/sks/algorithm#rsa3072", null,
                 "RSA",
                 3072,
                 AsymSignatureAlgorithms.RSA_SHA512,
@@ -59,7 +59,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA4096     ("http://xmlns.webpki.org/sks/algorithm#rsa4096", null,
+    RSA4096     ("https://webpki.github.io/sks/algorithm#rsa4096", null,
                 "RSA",
                 4096,
                 AsymSignatureAlgorithms.RSA_SHA512,
@@ -68,7 +68,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA1024_EXP ("http://xmlns.webpki.org/sks/algorithm#rsa1024.exp", null,
+    RSA1024_EXP ("https://webpki.github.io/sks/algorithm#rsa1024.exp", null,
                 "RSA",
                 1024,
                 AsymSignatureAlgorithms.RSA_SHA256,
@@ -77,7 +77,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA2048_EXP ("http://xmlns.webpki.org/sks/algorithm#rsa2048.exp", null,
+    RSA2048_EXP ("https://webpki.github.io/sks/algorithm#rsa2048.exp", null,
                 "RSA",
                 2048,
                 AsymSignatureAlgorithms.RSA_SHA256,
@@ -86,7 +86,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA3072_EXP ("http://xmlns.webpki.org/sks/algorithm#rsa3072.exp", null,
+    RSA3072_EXP ("https://webpki.github.io/sks/algorithm#rsa3072.exp", null,
                 "RSA",
                 3072,
                 AsymSignatureAlgorithms.RSA_SHA512,
@@ -95,7 +95,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    RSA4096_EXP ("http://xmlns.webpki.org/sks/algorithm#rsa4096.exp", null,
+    RSA4096_EXP ("https://webpki.github.io/sks/algorithm#rsa4096.exp", null,
                 "RSA",
                 4096,
                 AsymSignatureAlgorithms.RSA_SHA512,
@@ -104,7 +104,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                 null,
                 null),
     
-    NIST_B_233  ("http://xmlns.webpki.org/sks/algorithm#ec.nist.b233", null,
+    NIST_B_233  ("https://webpki.github.io/sks/algorithm#ec.nist.b233", null,
                 "sect233r1",
                 233,
                 AsymSignatureAlgorithms.ECDSA_SHA512,
@@ -124,7 +124,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0xF6, (byte)0x18, (byte)0xB8, (byte)0x4D, (byte)0xB8, (byte)0xD0, (byte)0x9C, (byte)0x81,
                     (byte)0xB4, (byte)0x99, (byte)0x3B, (byte)0x94}),
     
-    NIST_B_283  ("http://xmlns.webpki.org/sks/algorithm#ec.nist.b283", null,
+    NIST_B_283  ("https://webpki.github.io/sks/algorithm#ec.nist.b283", null,
                 "sect283r1",
                 283,
                 AsymSignatureAlgorithms.ECDSA_SHA512,
@@ -145,7 +145,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0xCF, (byte)0x07, (byte)0x7D, (byte)0x84, (byte)0xEC, (byte)0x23, (byte)0xC6, (byte)0x2C,
                     (byte)0x1E, (byte)0x12, (byte)0x0D, (byte)0x95, (byte)0xFD, (byte)0xC7, (byte)0xC7, (byte)0x0C}),
     
-    NIST_P_256  ("http://xmlns.webpki.org/sks/algorithm#ec.nist.p256", "P-256",
+    NIST_P_256  ("https://webpki.github.io/sks/algorithm#ec.nist.p256", "P-256",
                 "secp256r1",
                 256,
                 AsymSignatureAlgorithms.ECDSA_SHA256,
@@ -166,7 +166,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0xCA, (byte)0x5F, (byte)0xB5, (byte)0x09, (byte)0x6E, (byte)0x95, (byte)0xCF, (byte)0x78,
                     (byte)0x7C, (byte)0x0D, (byte)0xB2}),
     
-    NIST_P_384  ("http://xmlns.webpki.org/sks/algorithm#ec.nist.p384", "P-384",
+    NIST_P_384  ("https://webpki.github.io/sks/algorithm#ec.nist.p384", "P-384",
                 "secp384r1",
                 384,
                 AsymSignatureAlgorithms.ECDSA_SHA384,
@@ -190,7 +190,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0x82, (byte)0xBD, (byte)0x65, (byte)0x83, (byte)0xB6, (byte)0x84, (byte)0x77, (byte)0xE8,
                     (byte)0x1F, (byte)0xB8, (byte)0xD7, (byte)0x3D, (byte)0x79, (byte)0x88, (byte)0x2E, (byte)0x98}),
     
-    NIST_P_521  ("http://xmlns.webpki.org/sks/algorithm#ec.nist.p521", "P-521",
+    NIST_P_521  ("https://webpki.github.io/sks/algorithm#ec.nist.p521", "P-521",
                 "secp521r1",
                 521,
                 AsymSignatureAlgorithms.ECDSA_SHA512,
@@ -219,7 +219,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0x22, (byte)0xA8, (byte)0x87, (byte)0x64, (byte)0xD0, (byte)0x36, (byte)0xAF, (byte)0xD3,
                     (byte)0x69, (byte)0xAC, (byte)0xCA, (byte)0xCB, (byte)0x1A, (byte)0x96}),
                     
-    SECG_K_256 ("http://xmlns.webpki.org/sks/algorithm#ec.secg.p256k1", null,
+    SECG_K_256 ("https://webpki.github.io/sks/algorithm#ec.secg.p256k1", null,
                 "secp256k1",
                 256,
                 AsymSignatureAlgorithms.ECDSA_SHA256,
@@ -240,7 +240,7 @@ public enum KeyAlgorithms implements CryptoAlgorithms {
                     (byte)0x5B, (byte)0xC1, (byte)0x32, (byte)0x44, (byte)0xA6, (byte)0x32, (byte)0x06, (byte)0xA9}),                       
     
     BRAINPOOL_P_256 (
-                "http://xmlns.webpki.org/sks/algorithm#ec.brainpool.p256r1", null,
+                "https://webpki.github.io/sks/algorithm#ec.brainpool.p256r1", null,
                 "brainpoolP256r1",
                 256,
                 AsymSignatureAlgorithms.ECDSA_SHA256,
diff --git a/library/src/org/webpki/crypto/SymEncryptionAlgorithms.java b/library/src/org/webpki/crypto/SymEncryptionAlgorithms.java
index bd25487b..a55a3164 100644
--- a/library/src/org/webpki/crypto/SymEncryptionAlgorithms.java
+++ b/library/src/org/webpki/crypto/SymEncryptionAlgorithms.java
@@ -35,16 +35,16 @@ public enum SymEncryptionAlgorithms implements EncryptionAlgorithms {
     KW_AES256       ("http://www.w3.org/2001/04/xmlenc#kw-aes256",
                      "AESWrap",              32, false, false, false, true),
                 
-    AES_ECB_NOPAD   ("http://xmlns.webpki.org/sks/algorithm#aes.ecb.nopad",
+    AES_ECB_NOPAD   ("https://webpki.github.io/sks/algorithm#aes.ecb.nopad",
                      "AES/ECB/NoPadding",    0,  false, false, true,  true),  // SecurID
                 
-    AES_ECB_PAD     ("http://xmlns.webpki.org/sks/algorithm#aes.ecb",
+    AES_ECB_PAD     ("https://webpki.github.io/sks/algorithm#aes.ecb",
                      "AES/ECB/PKCS5Padding", 0,  false, false, false, false),
                 
-    AES_CBC_NOPAD   ("http://xmlns.webpki.org/sks/algorithm#aes.cbc.nopad",
+    AES_CBC_NOPAD   ("https://webpki.github.io/sks/algorithm#aes.cbc.nopad",
                      "AES/CBC/NoPadding",    0,  true,  false, false,  true),
                 
-    AES_CBC_PAD     ("http://xmlns.webpki.org/sks/algorithm#aes.cbc",
+    AES_CBC_PAD     ("https://webpki.github.io/sks/algorithm#aes.cbc",
                      "AES/CBC/PKCS5Padding", 0,  true,  false, true,   false);
 
     private final String sksName;          // As expressed in SKS
diff --git a/library/src/org/webpki/json/JSONAsymKeyVerifier.java b/library/src/org/webpki/json/JSONAsymKeyVerifier.java
index c4f59345..46c92d55 100644
--- a/library/src/org/webpki/json/JSONAsymKeyVerifier.java
+++ b/library/src/org/webpki/json/JSONAsymKeyVerifier.java
@@ -37,7 +37,7 @@ public class JSONAsymKeyVerifier extends JSONVerifier {
      * which is useful if there are multiple keys possible.
      *
      * @param expectedPublicKey Expected public key
-     * @throws GeneralSecurityException 
+     * @throws GeneralSecurityException &nbsp;
      */
     public JSONAsymKeyVerifier(PublicKey expectedPublicKey) throws GeneralSecurityException {
         super(JSONSignatureTypes.ASYMMETRIC_KEY);
diff --git a/library/src/org/webpki/keygen2/KeyGen2Constants.java b/library/src/org/webpki/keygen2/KeyGen2Constants.java
index 05faf8c9..295d6a75 100644
--- a/library/src/org/webpki/keygen2/KeyGen2Constants.java
+++ b/library/src/org/webpki/keygen2/KeyGen2Constants.java
@@ -152,8 +152,6 @@ public interface KeyGen2Constants {
 
     String SERVER_EPHEMERAL_KEY_JSON                 = SecureKeyStore.VAR_SERVER_EPHEMERAL_KEY;
 
-    String SERVER_CERT_FP_JSON                       = "serverCertificateFingerPrint";
-
     String SERVER_SEED_JSON                          = SecureKeyStore.VAR_SERVER_SEED;
     
     String SERVER_SESSION_ID_JSON                    = SecureKeyStore.VAR_SERVER_SESSION_ID;
diff --git a/library/src/org/webpki/keygen2/KeyGen2URIs.java b/library/src/org/webpki/keygen2/KeyGen2URIs.java
index 9b2bb65f..13bed9dc 100644
--- a/library/src/org/webpki/keygen2/KeyGen2URIs.java
+++ b/library/src/org/webpki/keygen2/KeyGen2URIs.java
@@ -20,28 +20,28 @@ public interface KeyGen2URIs {
 
     public interface LOGOTYPES {
 
-        String ICON                        = "http://xmlns.webpki.org/keygen2/logotype#icon";
+        String ICON                        = "https://webpki.github.io/keygen2/logotype#icon";
 
-        String CARD                        = "http://xmlns.webpki.org/keygen2/logotype#card";
+        String CARD                        = "https://webpki.github.io/keygen2/logotype#card";
 
-        String LIST                        = "http://xmlns.webpki.org/keygen2/logotype#list";
+        String LIST                        = "https://webpki.github.io/keygen2/logotype#list";
 
-        String APPLICATION                 = "http://xmlns.webpki.org/keygen2/logotype#application";
+        String APPLICATION                 = "https://webpki.github.io/keygen2/logotype#application";
     }
 
     public interface CLIENT_ATTRIBUTES {
 
-        String IMEI_NUMBER                 = "http://xmlns.webpki.org/keygen2/clientattr#imei-number";
+        String IMEI_NUMBER                 = "https://webpki.github.io/keygen2/clientattr#imei-number";
         
-        String MAC_ADDRESS                 = "http://xmlns.webpki.org/keygen2/clientattr#mac-address";
+        String MAC_ADDRESS                 = "https://webpki.github.io/keygen2/clientattr#mac-address";
   
-        String IP_ADDRESS                  = "http://xmlns.webpki.org/keygen2/clientattr#ip-address";
+        String IP_ADDRESS                  = "https://webpki.github.io/keygen2/clientattr#ip-address";
 
-        String OS_VENDOR                   = "http://xmlns.webpki.org/keygen2/clientattr#os-vendor";
+        String OS_VENDOR                   = "https://webpki.github.io/keygen2/clientattr#os-vendor";
 
-        String OS_VERSION                  = "http://xmlns.webpki.org/keygen2/clientattr#os-version";
+        String OS_VERSION                  = "https://webpki.github.io/keygen2/clientattr#os-version";
 
-        String DEVICE_PIN_SUPPORT          = "http://xmlns.webpki.org/keygen2/clientattr#device-pin-support";
+        String DEVICE_PIN_SUPPORT          = "https://webpki.github.io/keygen2/clientattr#device-pin-support";
     }
 
 }
diff --git a/library/src/org/webpki/keygen2/MacGenerator.java b/library/src/org/webpki/keygen2/MacGenerator.java
index 611460d9..de674f29 100644
--- a/library/src/org/webpki/keygen2/MacGenerator.java
+++ b/library/src/org/webpki/keygen2/MacGenerator.java
@@ -26,37 +26,37 @@ class MacGenerator {
     MacGenerator() {
         baos = new ByteArrayOutputStream();
     }
-
-    private byte[] short2bytes(int s) {
-        return new byte[]{(byte) (s >>> 8), (byte) s};
-    }
-
-    private byte[] int2bytes(int i) {
-        return new byte[]{(byte) (i >>> 24), (byte) (i >>> 16), (byte) (i >>> 8), (byte) i};
+    
+    void addCoreArray(byte[] data) throws IOException {
+        baos.write(data);
     }
 
     void addBlob(byte[] data) throws IOException {
-        baos.write(int2bytes(data.length));
+        addInt(data.length);
         baos.write(data);
     }
 
     void addArray(byte[] data) throws IOException {
-        baos.write(short2bytes(data.length));
+        addShort(data.length);
         baos.write(data);
     }
 
     void addString(String string) throws IOException {
-        addArray(string.getBytes("UTF-8"));
+        addArray(string.getBytes("utf-8"));
     }
 
-    void addInt(int i) throws IOException {
-        baos.write(int2bytes(i));
-    }
 
     void addShort(int s) throws IOException {
-        baos.write(short2bytes(s));
+        baos.write((byte)(s >>> 8));
+        baos.write((byte)(s));
+    }
+    
+    void addInt(int i) throws IOException {
+        addShort(i >>> 16);
+        addShort(i);
     }
 
+
     void addByte(byte b) {
         baos.write(b);
     }
diff --git a/library/src/org/webpki/keygen2/ProvisioningInitializationResponseDecoder.java b/library/src/org/webpki/keygen2/ProvisioningInitializationResponseDecoder.java
index 293ad4b1..68d93cae 100644
--- a/library/src/org/webpki/keygen2/ProvisioningInitializationResponseDecoder.java
+++ b/library/src/org/webpki/keygen2/ProvisioningInitializationResponseDecoder.java
@@ -26,9 +26,7 @@
 
 import org.webpki.crypto.AlgorithmPreferences;
 
-import org.webpki.json.JSONCryptoHelper;
 import org.webpki.json.JSONObjectReader;
-import org.webpki.json.JSONSignatureDecoder;
 
 import org.webpki.util.ISODateTime;
 
@@ -52,10 +50,6 @@ public class ProvisioningInitializationResponseDecoder extends KeyGen2Validator
 
     X509Certificate[] deviceCertificatePath;  // Is null for the privacy_enabled mode
 
-    byte[] serverCertificateFingerprint;
-
-    JSONSignatureDecoder signature;
-
     public X509Certificate[] getDeviceCertificatePath() {
         return deviceCertificatePath;
     }
@@ -75,8 +69,6 @@ protected void readJSONData(JSONObjectReader rd) throws IOException {
 
         clientTime = rd.getDateTime(CLIENT_TIME_JSON, ISODateTime.LOCAL_NO_SUBSECONDS);
 
-        serverCertificateFingerprint = rd.getBinary(SERVER_CERT_FP_JSON);
-
         /////////////////////////////////////////////////////////////////////////////////////////
         // Get the ephemeral client key
         /////////////////////////////////////////////////////////////////////////////////////////
@@ -89,11 +81,6 @@ protected void readJSONData(JSONObjectReader rd) throws IOException {
         if (rd.hasProperty(DEVICE_ID_JSON)) {
             deviceCertificatePath = rd.getObject(DEVICE_ID_JSON).getCertificatePath();
         }
-
-        /////////////////////////////////////////////////////////////////////////////////////////
-        // Get the mandatory provisioning session data signature
-        /////////////////////////////////////////////////////////////////////////////////////////
-        signature = rd.getSignature(new JSONCryptoHelper.Options().setRequirePublicKeyInfo(false));
     }
 
     @Override
diff --git a/library/src/org/webpki/keygen2/ProvisioningInitializationResponseEncoder.java b/library/src/org/webpki/keygen2/ProvisioningInitializationResponseEncoder.java
index 5d6cc218..1c7389f8 100644
--- a/library/src/org/webpki/keygen2/ProvisioningInitializationResponseEncoder.java
+++ b/library/src/org/webpki/keygen2/ProvisioningInitializationResponseEncoder.java
@@ -20,18 +20,14 @@
 
 import java.util.GregorianCalendar;
 
-import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 
 import java.security.interfaces.ECPublicKey;
 
 import org.webpki.crypto.AlgorithmPreferences;
-import org.webpki.crypto.HashAlgorithms;
-import org.webpki.crypto.SymKeySignerInterface;
 
 import org.webpki.json.JSONEncoder;
 import org.webpki.json.JSONObjectWriter;
-import org.webpki.json.JSONSymKeySigner;
 
 import org.webpki.util.ISODateTime;
 
@@ -55,11 +51,6 @@ public class ProvisioningInitializationResponseEncoder extends JSONEncoder {
 
     X509Certificate[] deviceCertificatePath;  // Is null for the privacy_enabled mode
 
-    byte[] serverCertificateFingerprint;
-
-    JSONSymKeySigner sessionSignature;
-
-
     // Constructors
 
     public ProvisioningInitializationResponseEncoder(ProvisioningInitializationRequestDecoder prov_init_req,
@@ -67,9 +58,8 @@ public ProvisioningInitializationResponseEncoder(ProvisioningInitializationReque
                                                      String clientSessionId,
                                                      GregorianCalendar clientTime,
                                                      byte[] attestation,
-                                                     X509Certificate serverCertificate,
                                                      X509Certificate[] deviceCertificatePath) 
-    throws IOException, CertificateEncodingException {
+    throws IOException {
         this.serverSessionId = prov_init_req.serverSessionId;
         this.serverTimeVerbatim = prov_init_req.serverTimeVerbatim;
         this.clientEphemeralKey = clientEphemeralKey;
@@ -77,14 +67,8 @@ public ProvisioningInitializationResponseEncoder(ProvisioningInitializationReque
         this.clientTime = clientTime;
         this.attestation = attestation;
         this.deviceCertificatePath = deviceCertificatePath;
-        serverCertificateFingerprint = HashAlgorithms.SHA256.digest(serverCertificate.getEncoded());
     }
 
-    public void setResponseSigner(SymKeySignerInterface signer) throws IOException {
-        sessionSignature = new JSONSymKeySigner(signer);
-    }
-
-
     @Override
     protected void writeJSONData(JSONObjectWriter wr) throws IOException {
         //////////////////////////////////////////////////////////////////////////
@@ -116,16 +100,6 @@ protected void writeJSONData(JSONObjectWriter wr) throws IOException {
         // "Logical" position for the attestation
         ////////////////////////////////////////////////////////////////////////
         wr.setBinary(ATTESTATION_JSON, attestation);
-
-        ////////////////////////////////////////////////////////////////////////
-        // Server certificate fingerprint
-        ////////////////////////////////////////////////////////////////////////
-        wr.setBinary(SERVER_CERT_FP_JSON, serverCertificateFingerprint);
-
-        ////////////////////////////////////////////////////////////////////////
-        // Mandatory session signature
-        ////////////////////////////////////////////////////////////////////////
-        wr.setSignature(sessionSignature);
     }
 
     @Override
diff --git a/library/src/org/webpki/keygen2/ServerState.java b/library/src/org/webpki/keygen2/ServerState.java
index 2a4eeedd..61860de2 100644
--- a/library/src/org/webpki/keygen2/ServerState.java
+++ b/library/src/org/webpki/keygen2/ServerState.java
@@ -37,15 +37,11 @@
 
 import org.webpki.crypto.AlgorithmPreferences;
 import org.webpki.crypto.DeviceID;
-import org.webpki.crypto.HashAlgorithms;
 import org.webpki.crypto.KeyAlgorithms;
 import org.webpki.crypto.KeyContainerTypes;
-import org.webpki.crypto.MACAlgorithms;
-import org.webpki.crypto.SymKeyVerifierInterface;
 
 import org.webpki.json.JSONArrayWriter;
 import org.webpki.json.JSONObjectWriter;
-import org.webpki.json.JSONSymKeyVerifier;
 
 import org.webpki.sks.AppUsage;
 import org.webpki.sks.BiometricProtection;
@@ -666,13 +662,6 @@ public PublicKey getPublicKey() {
         }
 
 
-        byte[] attestation;   // Filled in by KeyCreationRequestDecoder
-
-        public byte[] getAttestation() {
-            return attestation;
-        }
-
-
         ExportProtection exportProtection;
 
         public Key setExportProtection(ExportProtection exportProtection) {
@@ -852,6 +841,8 @@ public Key setUpdatedKey(String oldClientSessionId,
                 }
             }
         }
+        
+        byte[] macInputData;
 
         void writeRequest(JSONObjectWriter wr) throws IOException {
             keyInitDone = true;
@@ -932,7 +923,8 @@ void writeRequest(JSONObjectWriter wr) throws IOException {
                 wr.setStringArray(ENDORSED_ALGORITHMS_JSON, endorsedAlgorithms);
             }
 
-            wr.setBinary(MAC_JSON, mac(keyPairMac.getResult(), SecureKeyStore.METHOD_CREATE_KEY_ENTRY));
+            wr.setBinary(MAC_JSON, mac(macInputData = keyPairMac.getResult(), 
+                                       SecureKeyStore.METHOD_CREATE_KEY_ENTRY));
 
             expectedAttestMacCount = getMacSequenceCounterAndUpdate();
         }
@@ -1097,7 +1089,7 @@ public boolean isFeatureSupported(String featureTypeUri) throws IOException {
 
     byte[] savedCloseNonce;
     
-    byte[] serverCertificateFingerprint;
+    X509Certificate serverCertificate;
 
     X509Certificate[] deviceCertificatePath;
 
@@ -1202,7 +1194,7 @@ public void setTargetKeyContainerList(KeyContainerTypes[] optionalKeyContainerLi
     // Constructor
     public ServerState(ServerCryptoInterface serverCryptoInterface, 
                        String issuerUri,
-                       byte[] serverCertificateFingerprint,
+                       X509Certificate serverCertificate,
                        String optionalServerSessionId) throws IOException {
         this.serverCryptoInterface = serverCryptoInterface;
         this.issuerUri = issuerUri;
@@ -1214,7 +1206,7 @@ public ServerState(ServerCryptoInterface serverCryptoInterface,
                             SecureKeyStore.MAX_LENGTH_ID_TYPE - optionalServerSessionId.length());
         }
         serverSessionId = optionalServerSessionId;
-        this.serverCertificateFingerprint = serverCertificateFingerprint;
+        this.serverCertificate = serverCertificate;
     }
 
     ServerState addQuery(String typeUri, CAPABILITY what) throws IOException {
@@ -1269,54 +1261,41 @@ public void update(InvocationResponseDecoder invocationResponse) throws IOExcept
     }
 
 
-    public void update(ProvisioningInitializationResponseDecoder provisioningInitializationResponse) throws IOException {
-        try {
-            checkState(false, ProtocolPhase.PROVISIONING_INITIALIZATION);
-            clientSessionId = provisioningInitializationResponse.clientSessionId;
-            deviceCertificatePath = provisioningInitializationResponse.deviceCertificatePath;
-            clientEphemeralKey = provisioningInitializationResponse.clientEphemeralKey;
-            if (!serverTime.equals(provisioningInitializationResponse.serverTime)) {
-                bad("Received \"" + KeyGen2Constants.SERVER_TIME_JSON + "\" mismatch");
-            }
-
-            MacGenerator kdf = new MacGenerator();
-            kdf.addString(clientSessionId);
-            kdf.addString(serverSessionId);
-            kdf.addString(issuerUri);
-            kdf.addArray(getDeviceID());
-
-            MacGenerator attestationArguments = new MacGenerator();
-            attestationArguments.addString(clientSessionId);
-            attestationArguments.addString(serverSessionId);
-            attestationArguments.addString(issuerUri);
-            attestationArguments.addArray(getDeviceID());
-            attestationArguments.addString(provisioningSessionAlgorithm);
-            attestationArguments.addBool(getDeviceCertificate() == null);
-            attestationArguments.addArray(serverEphemeralKey.getEncoded());
-            attestationArguments.addArray(clientEphemeralKey.getEncoded());
-            attestationArguments.addArray(keyManagementKey == null ? new byte[0] : keyManagementKey.getEncoded());
-            attestationArguments.addInt((int) (provisioningInitializationResponse.clientTime.getTimeInMillis() / 1000));
-            attestationArguments.addInt(sessionLifeTime);
-            attestationArguments.addShort(sessionKeyLimit);
-
-            serverCryptoInterface.generateAndVerifySessionKey(clientEphemeralKey,
-                                                              kdf.getResult(),
-                                                              attestationArguments.getResult(),
-                                                              getDeviceCertificate(),
-                                                              provisioningInitializationResponse.attestation);
-            if (!ArrayUtil.compare(provisioningInitializationResponse.serverCertificateFingerprint,
-                    serverCertificateFingerprint)) {
-                bad("Attribute '" + SERVER_CERT_FP_JSON + "' is missing or is invalid");
-            }
-            provisioningInitializationResponse.signature.verify(new JSONSymKeyVerifier(new SymKeyVerifierInterface() {
-                @Override
-                public boolean verifyData(byte[] data, byte[] digest, MACAlgorithms algorithm, String keyId) throws IOException {
-                    return ArrayUtil.compare(serverCryptoInterface.mac(data, SecureKeyStore.KDF_EXTERNAL_SIGNATURE), digest);
-                }
-            }));
-        } catch (GeneralSecurityException e) {
-            throw new IOException(e);
-        }
+    public void update(ProvisioningInitializationResponseDecoder provisioningInitializationResponse) throws IOException, GeneralSecurityException {
+        checkState(false, ProtocolPhase.PROVISIONING_INITIALIZATION);
+        clientSessionId = provisioningInitializationResponse.clientSessionId;
+        deviceCertificatePath = provisioningInitializationResponse.deviceCertificatePath;
+        clientEphemeralKey = provisioningInitializationResponse.clientEphemeralKey;
+        if (!serverTime.equals(provisioningInitializationResponse.serverTime)) {
+            bad("Received \"" + KeyGen2Constants.SERVER_TIME_JSON + "\" mismatch");
+        }
+
+        MacGenerator kdf = new MacGenerator();
+        kdf.addString(clientSessionId);
+        kdf.addString(serverSessionId);
+        kdf.addString(issuerUri);
+        kdf.addArray(getDeviceID());
+
+        MacGenerator attestationArguments = new MacGenerator();
+        attestationArguments.addString(clientSessionId);
+        attestationArguments.addString(serverSessionId);
+        attestationArguments.addString(issuerUri);
+        attestationArguments.addArray(getDeviceID());
+        attestationArguments.addString(provisioningSessionAlgorithm);
+        attestationArguments.addBool(getDeviceCertificate() == null);
+        attestationArguments.addArray(serverEphemeralKey.getEncoded());
+        attestationArguments.addArray(clientEphemeralKey.getEncoded());
+        attestationArguments.addArray(keyManagementKey == null ? new byte[0] : keyManagementKey.getEncoded());
+        attestationArguments.addInt((int) (provisioningInitializationResponse.clientTime.getTimeInMillis() / 1000));
+        attestationArguments.addInt(sessionLifeTime);
+        attestationArguments.addShort(sessionKeyLimit);
+        attestationArguments.addArray(serverCertificate.getEncoded());
+
+        serverCryptoInterface.generateAndVerifySessionKey(clientEphemeralKey,
+                                                          kdf.getResult(),
+                                                          attestationArguments.getResult(),
+                                                          getDeviceCertificate(),
+                                                          provisioningInitializationResponse.attestation);
         currentPhase = ProtocolPhase.CREDENTIAL_DISCOVERY;
     }
 
@@ -1340,9 +1319,9 @@ public void update(KeyCreationResponseDecoder keyCreationResponse) throws IOExce
         if (keyCreationResponse.generatedKeys.size() != requestedKeys.size()) {
             ServerState.bad("Different number of requested and received keys");
         }
-        Iterator<ServerState.Key> req_key_iterator = requestedKeys.values().iterator();
+        Iterator<ServerState.Key> requestedKeysIterator = requestedKeys.values().iterator();
         for (KeyCreationResponseDecoder.GeneratedPublicKey gpk : keyCreationResponse.generatedKeys.values()) {
-            ServerState.Key kp = req_key_iterator.next();
+            ServerState.Key kp = requestedKeysIterator.next();
             if (!kp.id.equals(gpk.id)) {
                 ServerState.bad("Wrong ID order:" + gpk.id + " / " + kp.id);
             }
@@ -1350,11 +1329,11 @@ public void update(KeyCreationResponseDecoder keyCreationResponse) throws IOExce
                 ServerState.bad("Wrong key type returned for key id:" + gpk.id);
             }
             MacGenerator attestation = new MacGenerator();
-            // Write key attestation data
-            attestation.addString(gpk.id);
+            // Recreate anticipated key attestation data
             attestation.addArray(gpk.publicKey.getEncoded());
+            attestation.addCoreArray(kp.macInputData);
             if (!ArrayUtil.compare(attest(attestation.getResult(), kp.expectedAttestMacCount), 
-                                   kp.attestation = gpk.attestation)) {
+                                          gpk.attestation)) {
                 ServerState.bad("Attestation failed for key id:" + gpk.id);
             }
         }
diff --git a/library/src/org/webpki/sks/SKSException.java b/library/src/org/webpki/sks/SKSException.java
index 3a0908cc..7a573634 100644
--- a/library/src/org/webpki/sks/SKSException.java
+++ b/library/src/org/webpki/sks/SKSException.java
@@ -16,10 +16,9 @@
  */
 package org.webpki.sks;
 
-import java.io.IOException;
 
 @SuppressWarnings("serial")
-public class SKSException extends IOException {
+public class SKSException extends RuntimeException {
  
     /* Non-fatal error returned when there is something wrong with a
        supplied  PIN or PUK code.  See getKeyProtectionInfo */
diff --git a/library/src/org/webpki/sks/SecureKeyStore.java b/library/src/org/webpki/sks/SecureKeyStore.java
index 8c0cad01..e8f10db8 100644
--- a/library/src/org/webpki/sks/SecureKeyStore.java
+++ b/library/src/org/webpki/sks/SecureKeyStore.java
@@ -59,7 +59,6 @@ public interface SecureKeyStore {
     ///////////////////////////////////////////////////////////////////////////////////
     byte[] KDF_DEVICE_ATTESTATION             = {'D','e','v','i','c','e','A','t','t','e','s','t','a','t','i','o','n'};
     byte[] KDF_ENCRYPTION_KEY                 = {'E','n','c','r','y','p','t','i','o','n','K','e','y'};
-    byte[] KDF_EXTERNAL_SIGNATURE             = {'E','x','t','e','r','n','a','l','S','i','g','n','a','t','u','r','e'};
     byte[] KDF_ANONYMOUS                      = {'A','n','o','n','y','m','o','u','s'};
 
     ///////////////////////////////////////////////////////////////////////////////////
@@ -202,16 +201,16 @@ public interface SecureKeyStore {
     ///////////////////////////////////////////////////////////////////////////////////
     // Special algorithms
     ///////////////////////////////////////////////////////////////////////////////////
-    String ALGORITHM_KEY_ATTEST_1             = "http://xmlns.webpki.org/sks/algorithm#key.1";
-    String ALGORITHM_SESSION_ATTEST_1         = "http://xmlns.webpki.org/sks/algorithm#session.1";
-    String ALGORITHM_ECDH_RAW                 = "http://xmlns.webpki.org/sks/algorithm#ecdh.raw";
-    String ALGORITHM_NONE                     = "http://xmlns.webpki.org/sks/algorithm#none";
+    String ALGORITHM_KEY_ATTEST_1             = "https://webpki.github.io/sks/algorithm#key.1";
+    String ALGORITHM_SESSION_ATTEST_1         = "https://webpki.github.io/sks/algorithm#session.1";
+    String ALGORITHM_ECDH_RAW                 = "https://webpki.github.io/sks/algorithm#ecdh.raw";
+    String ALGORITHM_NONE                     = "https://webpki.github.io/sks/algorithm#none";
 
     ///////////////////////////////////////////////////////////////////////////////////
     // Miscellaneous
     ///////////////////////////////////////////////////////////////////////////////////
     byte[] ZERO_LENGTH_ARRAY                  = new byte[0];
-    short SKS_API_LEVEL                       = 99;
+    short SKS_API_LEVEL                       = 105;
     int AES_CBC_PKCS5_PADDING                 = 32;
 
     ///////////////////////////////////////////////////////////////////////////////////
@@ -226,7 +225,8 @@ ProvisioningSession createProvisioningSession(String sessionKeyAlgorithm,
                                                   PublicKey keyManagementKey, // Must be null if not applicable
                                                   int clientTime,
                                                   int sessionLifeTime,
-                                                  short sessionKeyLimit) throws SKSException;
+                                                  short sessionKeyLimit,
+                                                  byte[] serverCertificate) throws SKSException;
 
     byte[] closeProvisioningSession(int provisioningHandle,
                                     byte[] nonce,
@@ -235,8 +235,6 @@ byte[] closeProvisioningSession(int provisioningHandle,
     EnumeratedProvisioningSession enumerateProvisioningSessions(int provisioningHandle,
                                                                 boolean provisioningState) throws SKSException;
 
-    byte[] signProvisioningSessionData(int provisioningHandle,
-                                       byte[] data) throws SKSException;
 
     KeyData createKeyEntry(int provisioningHandle,
                            String id,
diff --git a/library/src/org/webpki/xmldsig/c14n/Canonicalizer.java b/library/src/org/webpki/xmldsig/c14n/Canonicalizer.java
index 997a2b95..1c6d6184 100644
--- a/library/src/org/webpki/xmldsig/c14n/Canonicalizer.java
+++ b/library/src/org/webpki/xmldsig/c14n/Canonicalizer.java
@@ -27,7 +27,7 @@
 /**
  * @author Christian Geuer-Pollmann
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class Canonicalizer {
 
     //J-
diff --git a/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315.java b/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315.java
index e44c9ccf..f94e50ac 100644
--- a/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315.java
+++ b/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315.java
@@ -37,7 +37,7 @@
  * @author Christian Geuer-Pollmann
  * @version $Revision: 1.37 $
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public abstract class Canonicalizer20010315 extends CanonicalizerBase {
     boolean firstCall = true;
     final SortedSet result = new TreeSet(COMPARE);
@@ -67,6 +67,7 @@ public Canonicalizer20010315(boolean includeComments) {
      * @return the Attr[]s to be outputted
      * @throws CanonicalizerException
      */
+    @SuppressWarnings("rawtypes")
     Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
             throws CanonicalizerException {
         if (!E.hasAttributes() && !firstCall) {
@@ -126,6 +127,7 @@ Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
      * @param E the root node.
      * @param result the xml:* attributes  to output.
      */
+    @SuppressWarnings("rawtypes")
     private void addXmlAttributesSubtree(Element E, SortedSet result) {
         // E is in the node-set
         Node parent = E.getParentNode();
@@ -266,6 +268,7 @@ Iterator handleAttributes(Element E, NameSpaceSymbTable ns) throws Canonicalizer
      * @param E
      * @param result
      */
+    @SuppressWarnings("rawtypes")
     private void addXmlAttributes(Element E, SortedSet result) {
     /* The processing of an element node E MUST be modified slightly when an
        * XPath node-set is given as input and the element's parent is omitted
diff --git a/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315Excl.java b/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315Excl.java
index f70e14b7..ad42296a 100644
--- a/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315Excl.java
+++ b/library/src/org/webpki/xmldsig/c14n/Canonicalizer20010315Excl.java
@@ -41,7 +41,7 @@
  * @author Christian Geuer-Pollmann
  * @version $Revision: 1.21 $
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
     /**
      * This Set contains the names (Strings like "xmlns" or "xmlns:foo") of
diff --git a/library/src/org/webpki/xmldsig/c14n/CanonicalizerBase.java b/library/src/org/webpki/xmldsig/c14n/CanonicalizerBase.java
index a0d57e98..f1de4b05 100644
--- a/library/src/org/webpki/xmldsig/c14n/CanonicalizerBase.java
+++ b/library/src/org/webpki/xmldsig/c14n/CanonicalizerBase.java
@@ -41,7 +41,7 @@
  * @author Christian Geuer-Pollmann
  * @version $Revision: 1.23 $
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public abstract class CanonicalizerBase extends CanonicalizerSpi {
     //Constants to be outputed, In char array form, so
     //less garbage is generate when outputed.
diff --git a/library/src/org/webpki/xmldsig/c14n/InclusiveNamespaces.java b/library/src/org/webpki/xmldsig/c14n/InclusiveNamespaces.java
index 0d2ff083..e1d0fa38 100644
--- a/library/src/org/webpki/xmldsig/c14n/InclusiveNamespaces.java
+++ b/library/src/org/webpki/xmldsig/c14n/InclusiveNamespaces.java
@@ -33,7 +33,7 @@
  *
  * @author Christian Geuer-Pollmann
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class InclusiveNamespaces {
 
     /**
diff --git a/library/src/org/webpki/xmldsig/c14n/NameSpaceSymbTable.java b/library/src/org/webpki/xmldsig/c14n/NameSpaceSymbTable.java
index a03e6e50..9833de1a 100644
--- a/library/src/org/webpki/xmldsig/c14n/NameSpaceSymbTable.java
+++ b/library/src/org/webpki/xmldsig/c14n/NameSpaceSymbTable.java
@@ -32,7 +32,7 @@
  *
  * @author Raul Benito
  **/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class NameSpaceSymbTable {
 
     /**
@@ -342,7 +342,7 @@ public Object clone() {
     Attr n;
 };
 
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 class SymbMap implements Cloneable {
     int free = 23;
     NameSpaceSymbEntry[] entries = new NameSpaceSymbEntry[free];
diff --git a/library/test/org/webpki/crypto/DeterministicSignatureWrapper.java b/library/test/org/webpki/crypto/DeterministicSignatureWrapper.java
index ffb250b4..dee10e05 100644
--- a/library/test/org/webpki/crypto/DeterministicSignatureWrapper.java
+++ b/library/test/org/webpki/crypto/DeterministicSignatureWrapper.java
@@ -35,7 +35,6 @@
 import org.webpki.json.JSONCryptoHelper;
 import org.webpki.json.JSONObjectWriter;
 import org.webpki.json.JSONParser;
-import org.webpki.json.JSONSignatureDecoder;
 
 import org.webpki.util.ArrayUtil;
 import org.webpki.util.DebugFormatter;
diff --git a/library/test/org/webpki/json/JSONTest.java b/library/test/org/webpki/json/JSONTest.java
index bb5350c4..22332f7d 100644
--- a/library/test/org/webpki/json/JSONTest.java
+++ b/library/test/org/webpki/json/JSONTest.java
@@ -3091,7 +3091,7 @@ public void UnreadProperties() throws Exception {
                     "  \"publicKey\": " +
                     "     {" +
                     "      \"kty\": \"EC\"," +
-                    "      \"crv\": \"http://xmlns.webpki.org/sks/algorithm#ec.nist.p521\"," +
+                    "      \"crv\": \"https://webpki.github.io/sks/algorithm#ec.nist.p521\"," +
                     "      \"x\": \"AQggHPZ-De2Tq_7U7v8ADpjyouKk6eV97Lujt9NdIcZgWI_cyOLv9HZulGWtC7I3X73ABE-rx95hAKbxiqQ1q0bA\"," +
                     "      \"y\": \"AP5yYckNtHGuzZ9Gb8oqueBXwgG5Riu5LnbhQUz5Mb_Xjo4mnhqe1f396ldZMUvyJdi2O03OZdhkpVv_ks2CsYHp\"" +
                     "    }" +
@@ -3137,7 +3137,7 @@ public void UnreadProperties() throws Exception {
                     "  \"publicKey\":" +
                     "    {" +
                     "      \"kty\": \"EC\"," +
-                    "      \"crv\": \"http://xmlns.webpki.org/sks/algorithm#ec.nist.p256\"," +
+                    "      \"crv\": \"https://webpki.github.io/sks/algorithm#ec.nist.p256\"," +
                     "      \"x\": \"GRgbhKB9Mw1lDKJFMbD_HsBvHR9235X7zF2SxHkDiOU\"," +
                     "      \"y\": \"isxpqxSx6AAEmZfgL5HevS67ejfm_4HcsB883TUaccs\"" +
                     "    }" +
@@ -3148,7 +3148,7 @@ public void UnreadProperties() throws Exception {
                     "  \"publicKey\":" +
                     "    {" +
                     "      \"kty\": \"EC\"," +
-                    "      \"crv\": \"http://xmlns.webpki.org/sks/algorithm#ec.nist.p256\"," +
+                    "      \"crv\": \"https://webpki.github.io/sks/algorithm#ec.nist.p256\"," +
                     "      \"x\": \"GRgbhKB9Mw1lDKJFMbD_HsBvHR9235X7zF2SxHkDiOU\"," +
                     "      \"y\": \"isxpqxSx6AAEmZfgL5HevS67ejfm_4HcsB883TUaccs\"," +
                     "      \"alien\": \"data\"" +
diff --git a/library/test/org/webpki/keygen2/KeyGen2Test.java b/library/test/org/webpki/keygen2/KeyGen2Test.java
index 39764ad6..c1ad6723 100644
--- a/library/test/org/webpki/keygen2/KeyGen2Test.java
+++ b/library/test/org/webpki/keygen2/KeyGen2Test.java
@@ -292,7 +292,7 @@ static class KeyCreator {
                         "\"@qualifier\": \"" + KeyGen2Messages.KEY_CREATION_REQUEST.getName() + "\",\n" +
                         "\"" + KeyGen2Constants.SERVER_SESSION_ID_JSON + "\": \"1417ace50e9IoDMto6NHlN1JWvysvZsC\",\n" +
                         "\"" + KeyGen2Constants.CLIENT_SESSION_ID_JSON + "\": \"KzyjlYG3YurWzSr2d9O9X3y_1EUsadmE\",\n" +
-                        "\"" + KeyGen2Constants.KEY_ENTRY_ALGORITHM_JSON + "\": \"http://xmlns.webpki.org/sks/algorithm#key.1\",\n";
+                        "\"" + KeyGen2Constants.KEY_ENTRY_ALGORITHM_JSON + "\": \"https://webpki.github.io/sks/algorithm#key.1\",\n";
         private static JSONDecoderCache json_cache;
 
         static {
@@ -348,7 +348,7 @@ KeyCreator addKey(AppUsage appUsage) {
                     .append(appUsage.getProtocolName())
                     .append("\", \"" + KeyGen2Constants.ID_JSON + "\":\"Key.")
                     .append(++keyId)
-                    .append("\", \"" + KeyGen2Constants.KEY_ALGORITHM_JSON + "\":\"http://xmlns.webpki.org/sks/algorithm#rsa2048\", \"" + KeyGen2Constants.MAC_JSON + "\":\"Jrqigi79Yw6SoLobsBA5S8b74gTKrIJPh3tQRKci33Y\"}");
+                    .append("\", \"" + KeyGen2Constants.KEY_ALGORITHM_JSON + "\":\"https://webpki.github.io/sks/algorithm#rsa2048\", \"" + KeyGen2Constants.MAC_JSON + "\":\"Jrqigi79Yw6SoLobsBA5S8b74gTKrIJPh3tQRKci33Y\"}");
             key_spec = false;
             return this;
         }
@@ -549,7 +549,8 @@ byte[] provSessResponse(byte[] json_data) throws IOException, GeneralSecurityExc
                             prov_sess_req.getKeyManagementKey(),
                             (int) (clientTime.getTimeInMillis() / 1000),
                             prov_sess_req.getSessionLifeTime(),
-                            prov_sess_req.getSessionKeyLimit());
+                            prov_sess_req.getSessionKeyLimit(),
+                            server_certificate.getEncoded());
             provisioning_handle = sess.getProvisioningHandle();
 
             ProvisioningInitializationResponseEncoder prov_init_response =
@@ -558,19 +559,8 @@ byte[] provSessResponse(byte[] json_data) throws IOException, GeneralSecurityExc
                             sess.getClientSessionId(),
                             clientTime,
                             sess.getAttestation(),
-                            server_certificate,
                             invocation_request.getPrivacyEnabledFlag() ? null : device_info.getCertificatePath());
 
-
-            prov_init_response.setResponseSigner(new SymKeySignerInterface() {
-                public MACAlgorithms getMacAlgorithm() throws IOException {
-                    return MACAlgorithms.HMAC_SHA256;
-                }
-
-                public byte[] signData(byte[] data, MACAlgorithms algorithm) throws IOException {
-                    return sks.signProvisioningSessionData(provisioning_handle, data);
-                }
-            });
             return prov_init_response.serializeJSONDocument(JSONOutputFormats.PRETTY_PRINT);
         }
 
@@ -803,7 +793,7 @@ class Server {
             server_xml_cache.addToCache(ProvisioningFinalizationResponseDecoder.class);
         }
 
-        void getProvSess(JSONDecoder xml_object) throws IOException {
+        void getProvSess(JSONDecoder xml_object) throws IOException, GeneralSecurityException {
             ////////////////////////////////////////////////////////////////////////////////////
             // Begin by creating the "SessionKey" that holds the key to just about everything
             ////////////////////////////////////////////////////////////////////////////////////
@@ -829,7 +819,7 @@ byte[] invocationRequest() throws IOException, GeneralSecurityException {
             ////////////////////////////////////////////////////////////////////////////////////
             serverState = new ServerState(serverCryptoInterface,
                                           INVOCATION_URL,
-                                          HashAlgorithms.SHA256.digest(server_certificate.getEncoded()),
+                                          server_certificate,
                                           null);
             if (privacy_enabled) {
                 serverState.setPrivacyEnabled(true);
diff --git a/library/test/org/webpki/securityproxy/extservice/ExtHTTPService.java b/library/test/org/webpki/securityproxy/extservice/ExtHTTPService.java
index d20135d6..faae47ad 100644
--- a/library/test/org/webpki/securityproxy/extservice/ExtHTTPService.java
+++ b/library/test/org/webpki/securityproxy/extservice/ExtHTTPService.java
@@ -32,7 +32,7 @@
 public class ExtHTTPService extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
-    private static Logger logger = Logger.getLogger(ExtHTTPService.class.getName());
+    static Logger logger = Logger.getLogger(ExtHTTPService.class.getName());
 
     @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
diff --git a/library/test/org/webpki/securityproxy/extservice/ExtJavaService.java b/library/test/org/webpki/securityproxy/extservice/ExtJavaService.java
index f78838c0..2d8184c7 100644
--- a/library/test/org/webpki/securityproxy/extservice/ExtJavaService.java
+++ b/library/test/org/webpki/securityproxy/extservice/ExtJavaService.java
@@ -33,7 +33,7 @@
 public class ExtJavaService extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
-    private static Logger logger = Logger.getLogger(ExtJavaService.class.getName());
+    static Logger logger = Logger.getLogger(ExtJavaService.class.getName());
 
     @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
diff --git a/library/test/org/webpki/securityproxy/extservice/ServiceStatus.java b/library/test/org/webpki/securityproxy/extservice/ServiceStatus.java
index 5423679a..88b75b40 100644
--- a/library/test/org/webpki/securityproxy/extservice/ServiceStatus.java
+++ b/library/test/org/webpki/securityproxy/extservice/ServiceStatus.java
@@ -33,7 +33,7 @@
 public class ServiceStatus extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
-    private static Logger logger = Logger.getLogger(ServiceStatus.class.getName());
+    static Logger logger = Logger.getLogger(ServiceStatus.class.getName());
 
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
diff --git a/library/test/org/webpki/sks/DummyTrustedGUIAuthorization.java b/library/test/org/webpki/sks/DummyTrustedGUIAuthorization.java
index 4e441fe7..7319955e 100644
--- a/library/test/org/webpki/sks/DummyTrustedGUIAuthorization.java
+++ b/library/test/org/webpki/sks/DummyTrustedGUIAuthorization.java
@@ -74,7 +74,6 @@ public byte[] restoreTrustedAuthorization(byte[] value) throws SKSException {
             Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
             crypt.init(Cipher.DECRYPT_MODE, new SecretKeySpec(SHARED_SECRET_32, "AES"), new IvParameterSpec(value, 32, 16));
             value = crypt.doFinal(value, 48, value.length - 48);
-        } catch (IOException e) {
         } catch (GeneralSecurityException e) {
             throw new SKSException(e);
         }
diff --git a/library/test/org/webpki/sks/ProvSess.java b/library/test/org/webpki/sks/ProvSess.java
index 0cf02baa..f0a61463 100644
--- a/library/test/org/webpki/sks/ProvSess.java
+++ b/library/test/org/webpki/sks/ProvSess.java
@@ -265,6 +265,10 @@ private byte[] short2bytes(int s) {
         private byte[] int2bytes(int i) {
             return new byte[]{(byte) (i >>> 24), (byte) (i >>> 16), (byte) (i >>> 8), (byte) i};
         }
+        
+        void addCoreArray(byte[] data) throws IOException {
+            baos.write(data);
+        }
 
         void addBlob(byte[] data) throws IOException {
             baos.write(int2bytes(data.length));
@@ -352,7 +356,8 @@ void bad(String message) throws IOException {
                         keyManagementKey,
                         (int) (clientTime.getTimeInMillis() / 1000),
                         sessionLifeTime,
-                        sessionKeyLimit);
+                        sessionKeyLimit,
+                        SKSTest.serverCertificate);
         clientSessionId = sess.getClientSessionId();
         provisioning_handle = sess.getProvisioningHandle();
 
@@ -375,6 +380,7 @@ void bad(String message) throws IOException {
         attestation_arguments.addInt((int) (clientTime.getTimeInMillis() / 1000));
         attestation_arguments.addInt(sessionLifeTime);
         attestation_arguments.addShort(sessionKeyLimit);
+        attestation_arguments.addArray(SKSTest.serverCertificate);
 
         server_sess_key.generateAndVerifySessionKey(sess.getClientEphemeralKey(),
                 kdf.getResult(),
@@ -618,6 +624,7 @@ public GenKey createKey(String id,
         for (String algorithm : sorted_algorithms) {
             key_entry_mac.addString(algorithm);
         }
+        byte[] data4macing = key_entry_mac.getResult();
         KeyData key_entry = sks.createKeyEntry(provisioning_handle,
                 id,
                 key_entry_algorithm,
@@ -634,10 +641,10 @@ public GenKey createKey(String id,
                 key_algorithm,
                 keyParameters,
                 sorted_algorithms,
-                mac4call(key_entry_mac.getResult(), SecureKeyStore.METHOD_CREATE_KEY_ENTRY));
+                mac4call(data4macing, SecureKeyStore.METHOD_CREATE_KEY_ENTRY));
         MacGenerator key_attestation = new MacGenerator();
-        key_attestation.addString(id);
         key_attestation.addArray(key_entry.getPublicKey().getEncoded());
+        key_attestation.addCoreArray(data4macing);
         if (!ArrayUtil.compare(attest(key_attestation.getResult()), key_entry.getAttestation())) {
             bad("Failed key attest");
         }
@@ -698,7 +705,4 @@ public byte[] getDeviceID() throws GeneralSecurityException {
         return privacy_enabled ? SecureKeyStore.KDF_ANONYMOUS : device.device_info.getCertificatePath()[0].getEncoded();
     }
 
-    public byte[] serverSessionSign(byte[] data) throws IOException, GeneralSecurityException {
-        return mac(data, SecureKeyStore.KDF_EXTERNAL_SIGNATURE);
-    }
 }
diff --git a/library/test/org/webpki/sks/SKSReferenceImplementation.java b/library/test/org/webpki/sks/SKSReferenceImplementation.java
index 575d130b..62653262 100644
--- a/library/test/org/webpki/sks/SKSReferenceImplementation.java
+++ b/library/test/org/webpki/sks/SKSReferenceImplementation.java
@@ -16,6 +16,7 @@
  */
 package org.webpki.sks;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
 
@@ -367,44 +368,40 @@ void checkEECertificateAvailability() throws SKSException {
             }
         }
 
-        MacBuilder getEeCertMacBuilder(byte[] method) throws SKSException {
+        MacBuilder getEeCertMacBuilder(byte[] method) throws SKSException, GeneralSecurityException, IOException {
             checkEECertificateAvailability();
             MacBuilder macBuilder = owner.getMacBuilderForMethodCall(method);
-            try {
-                macBuilder.addArray(certificatePath[0].getEncoded());
-                return macBuilder;
-            } catch (GeneralSecurityException e) {
-                throw new SKSException(e, SKSException.ERROR_INTERNAL);
-            }
+            macBuilder.addArray(certificatePath[0].getEncoded());
+            return macBuilder;
         }
 
         void validateTargetKeyReference(MacBuilder verifier,
                                         byte[] mac,
                                         byte[] authorization,
                                         Provisioning provisioning) throws SKSException {
-            ///////////////////////////////////////////////////////////////////////////////////
-            // "Sanity check"
-            ///////////////////////////////////////////////////////////////////////////////////
-            if (provisioning.privacyEnabled ^ owner.privacyEnabled) {
-                provisioning.abort("Inconsistent use of the \"" + VAR_PRIVACY_ENABLED + "\" attribute for key #" + keyHandle);
-            }
-
-            ///////////////////////////////////////////////////////////////////////////////////
-            // Verify MAC
-            ///////////////////////////////////////////////////////////////////////////////////
-            verifier.addArray(authorization);
-            provisioning.verifyMac(verifier, mac);
-
-            ///////////////////////////////////////////////////////////////////////////////////
-            // Verify KMK signature
-            ///////////////////////////////////////////////////////////////////////////////////
             try {
+                ///////////////////////////////////////////////////////////////////////////////////
+                // "Sanity check"
+                ///////////////////////////////////////////////////////////////////////////////////
+                if (provisioning.privacyEnabled ^ owner.privacyEnabled) {
+                    provisioning.abort("Inconsistent use of the \"" + VAR_PRIVACY_ENABLED + "\" attribute for key #" + keyHandle);
+                }
+    
+                ///////////////////////////////////////////////////////////////////////////////////
+                // Verify MAC
+                ///////////////////////////////////////////////////////////////////////////////////
+                verifier.addArray(authorization);
+                provisioning.verifyMac(verifier, mac);
+    
+                ///////////////////////////////////////////////////////////////////////////////////
+                // Verify KMK signature
+                ///////////////////////////////////////////////////////////////////////////////////
                 if (!owner.verifyKeyManagementKeyAuthorization(KMK_TARGET_KEY_REFERENCE,
                         provisioning.getMacBuilder(getDeviceID(provisioning.privacyEnabled))
                             .addVerbatim(certificatePath[0].getEncoded()).getResult(), authorization)) {
                     provisioning.abort("\"" + VAR_AUTHORIZATION + "\" signature did not verify for key #" + keyHandle);
                 }
-            } catch (GeneralSecurityException e) {
+            } catch (IOException | GeneralSecurityException e) {
                 provisioning.abort(e.getMessage(), SKSException.ERROR_CRYPTO);
             }
         }
@@ -516,7 +513,7 @@ class Provisioning implements SKSError, Serializable {
             provisionings.put(provisioningHandle, this);
         }
 
-        void verifyMac(MacBuilder actualMac, byte[] claimedMac) throws SKSException {
+        void verifyMac(MacBuilder actualMac, byte[] claimedMac) throws SKSException, IOException {
             if (!Arrays.equals(actualMac.getResult(), claimedMac)) {
                 abort("MAC error", SKSException.ERROR_MAC);
             }
@@ -527,34 +524,30 @@ void abort(String message, int exceptionType) throws SKSException {
             throw new SKSException(message, exceptionType);
         }
 
+        void abort(Throwable e) throws SKSException {
+            abort(e.getMessage(), SKSException.ERROR_INTERNAL);
+        }
+
         @Override
         public void abort(String message) throws SKSException {
             abort(message, SKSException.ERROR_OPTION);
         }
 
-        byte[] decrypt(byte[] data) throws SKSException {
+        byte[] decrypt(byte[] data) throws SKSException, GeneralSecurityException, IOException {
             byte[] key = getMacBuilder(ZERO_LENGTH_ARRAY).addVerbatim(KDF_ENCRYPTION_KEY).getResult();
-            try {
-                Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
-                crypt.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(data, 0, 16));
-                return crypt.doFinal(data, 16, data.length - 16);
-            } catch (GeneralSecurityException e) {
-                throw new SKSException(e);
-            }
+            Cipher crypt = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            crypt.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(data, 0, 16));
+            return crypt.doFinal(data, 16, data.length - 16);
         }
 
-        MacBuilder getMacBuilder(byte[] keyModifier) throws SKSException {
+        MacBuilder getMacBuilder(byte[] keyModifier) throws SKSException, GeneralSecurityException {
             if (sessionKeyLimit-- <= 0) {
                 abort("\"" + VAR_SESSION_KEY_LIMIT + "\" exceeded");
             }
-            try {
-                return new MacBuilder(addArrays(sessionKey, keyModifier));
-            } catch (GeneralSecurityException e) {
-                throw new SKSException(e);
-            }
+            return new MacBuilder(addArrays(sessionKey, keyModifier));
         }
 
-        MacBuilder getMacBuilderForMethodCall(byte[] method) throws SKSException {
+        MacBuilder getMacBuilderForMethodCall(byte[] method) throws SKSException, GeneralSecurityException {
             short q = macSequenceCounter++;
             return getMacBuilder(addArrays(method, new byte[]{(byte) (q >>> 8), (byte) q}));
         }
@@ -628,111 +621,88 @@ boolean verifyKeyManagementKeyAuthorization(byte[] kmkKdf,
     }
 
 
-    class MacBuilder implements Serializable {
-        private static final long serialVersionUID = 1L;
+    class ByteWriter {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        Mac mac;
+        void addByte(byte value) {
+            baos.write(value);
+        }
 
-        MacBuilder(byte[] key) throws GeneralSecurityException {
-            mac = Mac.getInstance("HmacSHA256");
-            mac.init(new SecretKeySpec(key, "RAW"));
+        void addArrayCore(byte[] value) throws IOException{
+            baos.write(value);
         }
 
-        MacBuilder addVerbatim(byte[] data) {
-            mac.update(data);
-            return this;
+        void addBool(boolean value) {
+            addByte((byte)(value ? 1 : 0));
         }
 
-        void addArray(byte[] data) {
-            addShort(data.length);
-            mac.update(data);
+        void addShort(int value) {
+            addByte((byte)(value >>> 8));
+            addByte((byte)(value));
         }
 
-        void addBlob(byte[] data) {
-            addInt(data.length);
-            mac.update(data);
+        void addArray(byte[] value) throws IOException {
+            addShort(value.length);
+            baos.write(value);
         }
 
-        void addString(String string) throws SKSException {
+        void addString(String string) throws IOException {
             addArray(getBinary(string));
         }
-
-        void addInt(int i) {
-            mac.update((byte) (i >>> 24));
-            mac.update((byte) (i >>> 16));
-            mac.update((byte) (i >>> 8));
-            mac.update((byte) i);
+        
+        void addInt(int value) {
+            addByte((byte)(value >>> 24));
+            addByte((byte)(value >>> 16));
+            addByte((byte)(value >>> 8));
+            addByte((byte)(value));
         }
-
-        void addShort(int s) {
-            mac.update((byte) (s >>> 8));
-            mac.update((byte) s);
+        
+        void addBlob(byte[] blob) throws IOException {
+            addInt(blob.length);
+            addArrayCore(blob);
         }
+        
+        byte[] getData() throws IOException {
+             return baos.toByteArray();
+        }
+
+    }
+    
 
-        void addByte(byte b) {
-            mac.update(b);
+    class MacBuilder extends ByteWriter implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        Mac mac;
+
+        MacBuilder(byte[] key) throws GeneralSecurityException {
+            mac = Mac.getInstance("HmacSHA256");
+            mac.init(new SecretKeySpec(key, "RAW"));
         }
 
-        void addBool(boolean flag) {
-            mac.update(flag ? (byte) 0x01 : (byte) 0x00);
+        MacBuilder addVerbatim(byte[] data) throws IOException {
+            addArrayCore(data);
+            return this;
         }
 
-        byte[] getResult() {
+        byte[] getResult() throws IOException {
+            mac.update(getData());
             return mac.doFinal();
         }
     }
 
-
-    class AttestationSignatureGenerator {
+    class AttestationSignatureGenerator extends ByteWriter {
 
         SignatureWrapper signer;
 
         AttestationSignatureGenerator() throws GeneralSecurityException {
             PrivateKey attester = getAttestationKey();
-            signer = new SignatureWrapper(attester instanceof RSAPrivateKey ? "SHA256withRSA" : "SHA256withECDSA",
+            signer = new SignatureWrapper(attester instanceof RSAPrivateKey ?
+                                                            "SHA256withRSA" : "SHA256withECDSA",
                                           attester);
         }
 
-        private byte[] short2bytes(int s) {
-            return new byte[]{(byte) (s >>> 8), (byte) s};
-        }
-
-        private byte[] int2bytes(int i) {
-            return new byte[]{(byte) (i >>> 24), (byte) (i >>> 16), (byte) (i >>> 8), (byte) i};
-        }
-
-        void addBlob(byte[] data) throws GeneralSecurityException {
-            signer.update(int2bytes(data.length));
-            signer.update(data);
-        }
-
-        void addArray(byte[] data) throws GeneralSecurityException {
-            signer.update(short2bytes(data.length));
-            signer.update(data);
-        }
-
-        void addString(String string) throws IOException, GeneralSecurityException {
-            addArray(string.getBytes("UTF-8"));
-        }
-
-        void addInt(int i) throws GeneralSecurityException {
-            signer.update(int2bytes(i));
-        }
-
-        void addShort(int s) throws GeneralSecurityException {
-            signer.update(short2bytes(s));
-        }
-
-        void addByte(byte b) throws GeneralSecurityException {
-            signer.update(b);
-        }
-
-        void addBool(boolean flag) throws GeneralSecurityException {
-            signer.update(flag ? (byte) 0x01 : (byte) 0x00);
-        }
-
         byte[] getResult() throws GeneralSecurityException, IOException {
-            return signer.sign();
+            return signer.update(getData()).sign();
         }
     }
 
@@ -948,11 +918,11 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                      "AES/CBC/PKCS5Padding",
                      ALG_SYM_ENC | ALG_IV_INT | ALG_IV_REQ | ALG_SYML_256);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#aes.ecb.nopad",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#aes.ecb.nopad",
                      "AES/ECB/NoPadding",
                      ALG_SYM_ENC | ALG_SYML_128 | ALG_SYML_192 | ALG_SYML_256 | ALG_AES_PAD);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#aes.cbc",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#aes.cbc",
                      "AES/CBC/PKCS5Padding",
                      ALG_SYM_ENC | ALG_IV_REQ | ALG_SYML_128 | ALG_SYML_192 | ALG_SYML_256);
 
@@ -970,22 +940,22 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
         //////////////////////////////////////////////////////////////////////////////////////
         //  Asymmetric Key Decryption
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.es.pkcs1_5",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.es.pkcs1_5",
                      "RSA/ECB/PKCS1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha1",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.oaep.sha1",
                      "RSA/ECB/OAEPWithSHA-1AndMGF1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha256",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.oaep.sha256",
                      "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY | ALG_HASH_256);
 
         //////////////////////////////////////////////////////////////////////////////////////
         //  Diffie-Hellman Key Agreement
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ecdh.raw",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ecdh.raw",
                      "ECDH",
                      ALG_ASYM_KA | ALG_EC_KEY);
         
@@ -1022,18 +992,18 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                      "NONEwithECDSA",
                      ALG_ASYM_SGN | ALG_EC_KEY | ALG_HASH_512);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.pkcs1.none",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.pkcs1.none",
                      "NONEwithRSA",
                      ALG_ASYM_SGN | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ecdsa.none",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ecdsa.none",
                      "NONEwithECDSA",
                      ALG_ASYM_SGN | ALG_EC_KEY);
 
         //////////////////////////////////////////////////////////////////////////////////////
         //  Asymmetric Key Generation
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p256",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p256",
                      "secp256r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (32, new byte[]
               {(byte)0x30, (byte)0x59, (byte)0x30, (byte)0x13, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -1049,7 +1019,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0xCA, (byte)0x5F, (byte)0xB5, (byte)0x09, (byte)0x6E, (byte)0x95, (byte)0xCF, (byte)0x78,
                (byte)0x7C, (byte)0x0D, (byte)0xB2});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p384",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p384",
                      "secp384r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (48, new byte[]
               {(byte)0x30, (byte)0x76, (byte)0x30, (byte)0x10, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -1068,7 +1038,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x82, (byte)0xBD, (byte)0x65, (byte)0x83, (byte)0xB6, (byte)0x84, (byte)0x77, (byte)0xE8,
                (byte)0x1F, (byte)0xB8, (byte)0xD7, (byte)0x3D, (byte)0x79, (byte)0x88, (byte)0x2E, (byte)0x98});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p521",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p521",
                      "secp521r1",
                       ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (66, new byte[]
               {(byte)0x30, (byte)0x81, (byte)0x9B, (byte)0x30, (byte)0x10, (byte)0x06, (byte)0x07, (byte)0x2A,
@@ -1092,7 +1062,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x22, (byte)0xA8, (byte)0x87, (byte)0x64, (byte)0xD0, (byte)0x36, (byte)0xAF, (byte)0xD3,
                (byte)0x69, (byte)0xAC, (byte)0xCA, (byte)0xCB, (byte)0x1A, (byte)0x96});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.brainpool.p256r1",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.brainpool.p256r1",
                      "brainpoolP256r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (32, new byte[]
               {(byte)0x30, (byte)0x5A, (byte)0x30, (byte)0x14, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -1109,10 +1079,10 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x17, (byte)0xF3, (byte)0x3A, (byte)0xB4});
 
         for (short rsa_size : SKS_DEFAULT_RSA_SUPPORT) {
-            addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa" + rsa_size,
+            addAlgorithm("https://webpki.github.io/sks/algorithm#rsa" + rsa_size,
                          null, ALG_RSA_KEY | ALG_KEY_GEN | rsa_size);
             if (SKS_RSA_EXPONENT_SUPPORT) {
-                addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa" + rsa_size + ".exp",
+                addAlgorithm("https://webpki.github.io/sks/algorithm#rsa" + rsa_size + ".exp",
                              null, ALG_KEY_PARM | ALG_RSA_KEY | ALG_KEY_GEN | rsa_size);
             }
         }
@@ -1124,7 +1094,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
 
         addAlgorithm(ALGORITHM_KEY_ATTEST_1, null, 0);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#none", null, ALG_NONE);
+        addAlgorithm("https://webpki.github.io/sks/algorithm#none", null, ALG_NONE);
 
     }
 
@@ -1186,13 +1156,8 @@ Provisioning getClosedProvisioningSession(int provisioningHandle) throws SKSExce
         return provisioning;
     }
 
-    byte[] getBinary(String string) throws SKSException {
-        try {
-            return string.getBytes("UTF-8");
-        } catch (IOException e) {
-            abort("Internal UTF-8");
-            return null;
-        }
+    byte[] getBinary(String string) throws IOException {
+        return string.getBytes("utf-8");
     }
 
     int getShort(byte[] buffer, int index) {
@@ -1268,6 +1233,21 @@ void abort(String message, int option) throws SKSException {
         throw new SKSException(message, option);
     }
 
+
+    void tearDownSession(KeyEntry key, Throwable e) throws SKSException {
+        if (key == null) {
+            throw new SKSException(e);
+        }
+        key.owner.abort(e);
+    }
+
+    void tearDownSession(Provisioning provisioning, Throwable e) throws SKSException {
+        if (provisioning == null) {
+            throw new SKSException(e);
+        }
+        provisioning.abort(e);
+    }
+    
     Algorithm getEcType(ECKey ecKey) {
         for (String uri : supportedAlgorithms.keySet()) {
             ECParameterSpec ecParameterSpec = supportedAlgorithms.get(uri).ecParameterSpec;
@@ -1537,76 +1517,88 @@ void addUpdateKeyOrCloneKeyProtection(int keyHandle,
                                           byte[] authorization,
                                           byte[] mac,
                                           boolean update) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get open key and associated provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry newKey = getOpenKey(keyHandle);
-        Provisioning provisioning = newKey.owner;
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key to be updated/cloned
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry targetKeyEntry = provisioning.getTargetKey(targetKeyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Perform some "sanity" tests
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (newKey.pinPolicy != null || newKey.devicePinProtection) {
-            provisioning.abort("Updated/cloned keys must not define PIN protection");
-        }
-        if (update) {
-            if (targetKeyEntry.appUsage != newKey.appUsage) {
-                provisioning.abort("Updated keys must have the same \"" + VAR_APP_USAGE + "\" as the target key");
-            }
-        } else {
+        KeyEntry newKey = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get open key and associated provisioning session
             ///////////////////////////////////////////////////////////////////////////////////
-            // Cloned keys must share the PIN of its parent
+            newKey = getOpenKey(keyHandle);
+            Provisioning provisioning = newKey.owner;
+    
             ///////////////////////////////////////////////////////////////////////////////////
-            if (targetKeyEntry.pinPolicy != null && targetKeyEntry.pinPolicy.grouping != PIN_GROUPING_SHARED) {
-                provisioning.abort("A cloned key protection must have PIN grouping=\"shared\"");
+            // Get key to be updated/cloned
+            ///////////////////////////////////////////////////////////////////////////////////
+            KeyEntry targetKeyEntry = provisioning.getTargetKey(targetKeyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Perform some "sanity" tests
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (newKey.pinPolicy != null || newKey.devicePinProtection) {
+                provisioning.abort("Updated/cloned keys must not define PIN protection");
+            }
+            if (update) {
+                if (targetKeyEntry.appUsage != newKey.appUsage) {
+                    provisioning.abort("Updated keys must have the same \"" + VAR_APP_USAGE + "\" as the target key");
+                }
+            } else {
+                ///////////////////////////////////////////////////////////////////////////////////
+                // Cloned keys must share the PIN of its parent
+                ///////////////////////////////////////////////////////////////////////////////////
+                if (targetKeyEntry.pinPolicy != null && targetKeyEntry.pinPolicy.grouping != PIN_GROUPING_SHARED) {
+                    provisioning.abort("A cloned key protection must have PIN grouping=\"shared\"");
+                }
             }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC and target key data
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = newKey.getEeCertMacBuilder(update ? METHOD_POST_UPDATE_KEY : METHOD_POST_CLONE_KEY_PROTECTION);
+            targetKeyEntry.validateTargetKeyReference(verifier, mac, authorization, provisioning);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Put the operation in the post-op buffer used by "closeProvisioningSession"
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning.addPostProvisioningObject(targetKeyEntry, newKey, update);
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(newKey, e);
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC and target key data
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = newKey.getEeCertMacBuilder(update ? METHOD_POST_UPDATE_KEY : METHOD_POST_CLONE_KEY_PROTECTION);
-        targetKeyEntry.validateTargetKeyReference(verifier, mac, authorization, provisioning);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Put the operation in the post-op buffer used by "closeProvisioningSession"
-        ///////////////////////////////////////////////////////////////////////////////////
-        provisioning.addPostProvisioningObject(targetKeyEntry, newKey, update);
     }
 
+
     void addUnlockKeyOrDeleteKey(int provisioningHandle,
                                  int targetKeyHandle,
                                  byte[] authorization,
                                  byte[] mac,
                                  boolean delete) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key to be deleted or unlocked
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry targetKeyEntry = provisioning.getTargetKey(targetKeyHandle);
-        if (!delete && targetKeyEntry.pinPolicy == null) {
-            provisioning.abort("Key #" + targetKeyHandle + " is not PIN protected");
+        Provisioning provisioning = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning = getOpenProvisioningSession(provisioningHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key to be deleted or unlocked
+            ///////////////////////////////////////////////////////////////////////////////////
+            KeyEntry targetKeyEntry = provisioning.getTargetKey(targetKeyHandle);
+            if (!delete && targetKeyEntry.pinPolicy == null) {
+                provisioning.abort("Key #" + targetKeyHandle + " is not PIN protected");
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC and target key data
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = provisioning.getMacBuilderForMethodCall(delete ?
+                                                          METHOD_POST_DELETE_KEY : METHOD_POST_UNLOCK_KEY);
+            targetKeyEntry.validateTargetKeyReference(verifier, mac, authorization, provisioning);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Put the operation in the post-op buffer used by "closeProvisioningSession"
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning.addPostProvisioningObject(targetKeyEntry, null, delete);
+        } catch (GeneralSecurityException e) {
+            tearDownSession(provisioning, e);
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC and target key data
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = provisioning.getMacBuilderForMethodCall(delete ? METHOD_POST_DELETE_KEY : METHOD_POST_UNLOCK_KEY);
-        targetKeyEntry.validateTargetKeyReference(verifier, mac, authorization, provisioning);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Put the operation in the post-op buffer used by "closeProvisioningSession"
-        ///////////////////////////////////////////////////////////////////////////////////
-        provisioning.addPostProvisioningObject(targetKeyEntry, null, delete);
     }
 
 
@@ -1761,43 +1753,48 @@ public synchronized void setProperty(int keyHandle,
                                          String type,
                                          String name,
                                          String value) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key (which must belong to an already fully provisioned session)
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry keyEntry = getStdKey(keyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Lookup the extension(s) bound to the key
-        ///////////////////////////////////////////////////////////////////////////////////
-        ExtObject extObj = keyEntry.extensions.get(type);
-        if (extObj == null || extObj.subType != SUB_TYPE_PROPERTY_BAG) {
-            abort("No such \"" + VAR_PROPERTY_BAG + "\" : " + type);
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Found, now look for the property name and update the associated value
-        ///////////////////////////////////////////////////////////////////////////////////
-        byte[] binName = getBinary(name);
-        byte[] binValue = getBinary(value);
-        int i = 0;
-        while (i < extObj.extensionData.length) {
-            int nameLen = getShort(extObj.extensionData, i);
-            i += 2;
-            byte[] pname = Arrays.copyOfRange(extObj.extensionData, i, nameLen + i);
-            i += nameLen;
-            int valueLen = getShort(extObj.extensionData, i + 1);
-            if (Arrays.equals(binName, pname)) {
-                if (extObj.extensionData[i] != 0x01) {
-                    abort("\"" + VAR_PROPERTY + "\" not writable: " + name, SKSException.ERROR_NOT_ALLOWED);
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key (which must belong to an already fully provisioned session)
+            ///////////////////////////////////////////////////////////////////////////////////
+            KeyEntry keyEntry = getStdKey(keyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Lookup the extension(s) bound to the key
+            ///////////////////////////////////////////////////////////////////////////////////
+            ExtObject extObj = keyEntry.extensions.get(type);
+            if (extObj == null || extObj.subType != SUB_TYPE_PROPERTY_BAG) {
+                abort("No such \"" + VAR_PROPERTY_BAG + "\" : " + type);
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Found, now look for the property name and update the associated value
+            ///////////////////////////////////////////////////////////////////////////////////
+            byte[] binName = getBinary(name);
+            byte[] binValue = getBinary(value);
+            int i = 0;
+            while (i < extObj.extensionData.length) {
+                int nameLen = getShort(extObj.extensionData, i);
+                i += 2;
+                byte[] pname = Arrays.copyOfRange(extObj.extensionData, i, nameLen + i);
+                i += nameLen;
+                int valueLen = getShort(extObj.extensionData, i + 1);
+                if (Arrays.equals(binName, pname)) {
+                    if (extObj.extensionData[i] != 0x01) {
+                        abort("\"" + VAR_PROPERTY + "\" not writable: " + name, SKSException.ERROR_NOT_ALLOWED);
+                    }
+                    extObj.extensionData = 
+                            addArrays(addArrays(Arrays.copyOfRange(extObj.extensionData, 0, ++i),
+                            addArrays(new byte[]{(byte) (binValue.length >> 8), (byte) binValue.length}, binValue)),
+                            Arrays.copyOfRange(extObj.extensionData, i + valueLen + 2, extObj.extensionData.length));
+                    return;
                 }
-                extObj.extensionData = addArrays(addArrays(Arrays.copyOfRange(extObj.extensionData, 0, ++i),
-                        addArrays(new byte[]{(byte) (binValue.length >> 8), (byte) binValue.length}, binValue)),
-                        Arrays.copyOfRange(extObj.extensionData, i + valueLen + 2, extObj.extensionData.length));
-                return;
+                i += valueLen + 3;
             }
-            i += valueLen + 3;
+            abort("\"" + VAR_PROPERTY + "\" not found: " + name);
+        } catch (IOException e) {
+            throw new SKSException(e);
         }
-        abort("\"" + VAR_PROPERTY + "\" not found: " + name);
     }
 
 
@@ -2308,25 +2305,6 @@ public synchronized EnumeratedProvisioningSession enumerateProvisioningSessions(
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //                                                                            //
-    //                      signProvisioningSessionData                           //
-    //                                                                            //
-    ////////////////////////////////////////////////////////////////////////////////
-    @Override
-    public synchronized byte[] signProvisioningSessionData(int provisioningHandle, byte[] data) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Sign (HMAC) data using a derived SessionKey
-        ///////////////////////////////////////////////////////////////////////////////////
-        return provisioning.getMacBuilder(KDF_EXTERNAL_SIGNATURE).addVerbatim(data).getResult();
-    }
-
-
     ////////////////////////////////////////////////////////////////////////////////
     //                                                                            //
     //                              getKeyHandle                                  //
@@ -2439,57 +2417,60 @@ public synchronized void abortProvisioningSession(int provisioningHandle) throws
     public synchronized byte[] closeProvisioningSession(int provisioningHandle,
                                                         byte[] nonce,
                                                         byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CLOSE_PROVISIONING_SESSION);
-        verifier.addString(provisioning.clientSessionId);
-        verifier.addString(provisioning.serverSessionId);
-        verifier.addString(provisioning.issuerUri);
-        verifier.addArray(nonce);
-        provisioning.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Generate the attestation in advance => checking SessionKeyLimit before "commit"
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder close_attestation = provisioning.getMacBuilderForMethodCall(KDF_DEVICE_ATTESTATION);
-        close_attestation.addArray(nonce);
-        byte[] attestation = close_attestation.getResult();
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Perform "sanity" checks on provisioned data
-        ///////////////////////////////////////////////////////////////////////////////////
-        for (String id : provisioning.names.keySet()) {
-            if (!provisioning.names.get(id)) {
-                provisioning.abort("Unreferenced object \"" + VAR_ID + "\" : " + id);
-            }
-        }
-        provisioning.names.clear();
-        for (KeyEntry keyEntry : keys.values()) {
-            if (keyEntry.owner == provisioning) {
-                ///////////////////////////////////////////////////////////////////////////////////
-                // A key provisioned in this session
-                ///////////////////////////////////////////////////////////////////////////////////
-                keyEntry.checkEECertificateAvailability();
-
-                ///////////////////////////////////////////////////////////////////////////////////
-                // Check public versus private key match
-                ///////////////////////////////////////////////////////////////////////////////////
-                if (keyEntry.isRsa() ^ keyEntry.privateKey instanceof RSAPrivateKey) {
-                    provisioning.abort("RSA/EC mixup between public and private keys for: " + keyEntry.id);
+        Provisioning provisioning = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning = getOpenProvisioningSession(provisioningHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = 
+                    provisioning.getMacBuilderForMethodCall(METHOD_CLOSE_PROVISIONING_SESSION);
+            verifier.addString(provisioning.clientSessionId);
+            verifier.addString(provisioning.serverSessionId);
+            verifier.addString(provisioning.issuerUri);
+            verifier.addArray(nonce);
+            provisioning.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Generate the attestation in advance => checking SessionKeyLimit before "commit"
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder close_attestation = 
+                    provisioning.getMacBuilderForMethodCall(KDF_DEVICE_ATTESTATION);
+            close_attestation.addArray(nonce);
+            byte[] attestation = close_attestation.getResult();
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Perform "sanity" checks on provisioned data
+            ///////////////////////////////////////////////////////////////////////////////////
+            for (String id : provisioning.names.keySet()) {
+                if (!provisioning.names.get(id)) {
+                    provisioning.abort("Unreferenced object \"" + VAR_ID + "\" : " + id);
                 }
-                if (keyEntry.isRsa()) {
-                    if (!((RSAPublicKey) keyEntry.publicKey).getPublicExponent().equals(keyEntry.getPublicRSAExponentFromPrivateKey()) ||
-                            !((RSAPublicKey) keyEntry.publicKey).getModulus().equals(((RSAPrivateKey) keyEntry.privateKey).getModulus())) {
-                        provisioning.abort("RSA mismatch between public and private keys for: " + keyEntry.id);
+            }
+            provisioning.names.clear();
+            for (KeyEntry keyEntry : keys.values()) {
+                if (keyEntry.owner == provisioning) {
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    // A key provisioned in this session
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    keyEntry.checkEECertificateAvailability();
+    
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    // Check public versus private key match
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    if (keyEntry.isRsa() ^ keyEntry.privateKey instanceof RSAPrivateKey) {
+                        provisioning.abort("RSA/EC mixup between public and private keys for: " + keyEntry.id);
                     }
-                } else {
-                    try {
+                    if (keyEntry.isRsa()) {
+                        if (!((RSAPublicKey) keyEntry.publicKey).getPublicExponent().equals(keyEntry.getPublicRSAExponentFromPrivateKey()) ||
+                                !((RSAPublicKey) keyEntry.publicKey).getModulus().equals(((RSAPrivateKey) keyEntry.privateKey).getModulus())) {
+                            provisioning.abort("RSA mismatch between public and private keys for: " + keyEntry.id);
+                        }
+                    } else {
                         Signature ecSigner = Signature.getInstance("SHA256withECDSA");
                         ecSigner.initSign(keyEntry.privateKey);
                         ecSigner.update(RSA_ENCRYPTION_OID);  // Any data could be used...
@@ -2500,157 +2481,158 @@ public synchronized byte[] closeProvisioningSession(int provisioningHandle,
                         if (!ecVerifier.verify(ecSignData)) {
                             provisioning.abort("EC mismatch between public and private keys for: " + keyEntry.id);
                         }
-                    } catch (GeneralSecurityException e) {
-                        provisioning.abort(e.getMessage());
                     }
-                }
-
-                ///////////////////////////////////////////////////////////////////////////////////
-                // Test that there are no collisions
-                ///////////////////////////////////////////////////////////////////////////////////
-                for (KeyEntry keyEntryTemp : keys.values()) {
-                    if (keyEntryTemp.keyHandle != keyEntry.keyHandle && keyEntryTemp.certificatePath != null &&
-                            keyEntryTemp.certificatePath[0].equals(keyEntry.certificatePath[0])) {
-                        ///////////////////////////////////////////////////////////////////////////////////
-                        // There was a conflict, ignore updates/deletes
-                        ///////////////////////////////////////////////////////////////////////////////////
-                        boolean collision = true;
-                        for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
-                            if (postOp.targetKeyEntry == keyEntryTemp && postOp.updateOrDelete) {
-                                collision = false;
+    
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    // Test that there are no collisions
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    for (KeyEntry keyEntryTemp : keys.values()) {
+                        if (keyEntryTemp.keyHandle != keyEntry.keyHandle && keyEntryTemp.certificatePath != null &&
+                                keyEntryTemp.certificatePath[0].equals(keyEntry.certificatePath[0])) {
+                            ///////////////////////////////////////////////////////////////////////////////////
+                            // There was a conflict, ignore updates/deletes
+                            ///////////////////////////////////////////////////////////////////////////////////
+                            boolean collision = true;
+                            for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
+                                if (postOp.targetKeyEntry == keyEntryTemp && postOp.updateOrDelete) {
+                                    collision = false;
+                                }
+                            }
+                            if (collision) {
+                                provisioning.abort("Duplicate certificate in \"setCertificatePath\" for: " + keyEntry.id);
                             }
-                        }
-                        if (collision) {
-                            provisioning.abort("Duplicate certificate in \"setCertificatePath\" for: " + keyEntry.id);
                         }
                     }
-                }
-
-                ///////////////////////////////////////////////////////////////////////////////////
-                // Check that possible endorsed algorithms match key material
-                ///////////////////////////////////////////////////////////////////////////////////
-                for (String algorithm : keyEntry.endorsedAlgorithms) {
-                    Algorithm alg = getAlgorithm(algorithm);
-                    if ((alg.mask & ALG_NONE) == 0) {
-                        ///////////////////////////////////////////////////////////////////////////////////
-                        // A non-null endorsed algorithm found.  Symmetric or asymmetric key?
-                        ///////////////////////////////////////////////////////////////////////////////////
-                        if (((alg.mask & (ALG_SYM_ENC | ALG_HMAC)) == 0) ^ keyEntry.isSymmetric()) {
-                            if (keyEntry.isSymmetric()) {
-                                ///////////////////////////////////////////////////////////////////////////////////
-                                // Symmetric. AES algorithms only operates on 128, 192, and 256 bit keys
-                                ///////////////////////////////////////////////////////////////////////////////////
-                                testAESKey(algorithm, keyEntry.symmetricKey, keyEntry.id, provisioning);
-                                continue;
-                            } else {
-                                ///////////////////////////////////////////////////////////////////////////////////
-                                // Asymmetric.  Check that algorithms match RSA or EC
-                                ///////////////////////////////////////////////////////////////////////////////////
-                                if (((alg.mask & ALG_RSA_KEY) == 0) ^ keyEntry.isRsa()) {
+    
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    // Check that possible endorsed algorithms match key material
+                    ///////////////////////////////////////////////////////////////////////////////////
+                    for (String algorithm : keyEntry.endorsedAlgorithms) {
+                        Algorithm alg = getAlgorithm(algorithm);
+                        if ((alg.mask & ALG_NONE) == 0) {
+                            ///////////////////////////////////////////////////////////////////////////////////
+                            // A non-null endorsed algorithm found.  Symmetric or asymmetric key?
+                            ///////////////////////////////////////////////////////////////////////////////////
+                            if (((alg.mask & (ALG_SYM_ENC | ALG_HMAC)) == 0) ^ keyEntry.isSymmetric()) {
+                                if (keyEntry.isSymmetric()) {
+                                    ///////////////////////////////////////////////////////////////////////////////////
+                                    // Symmetric. AES algorithms only operates on 128, 192, and 256 bit keys
+                                    ///////////////////////////////////////////////////////////////////////////////////
+                                    testAESKey(algorithm, keyEntry.symmetricKey, keyEntry.id, provisioning);
                                     continue;
+                                } else {
+                                    ///////////////////////////////////////////////////////////////////////////////////
+                                    // Asymmetric.  Check that algorithms match RSA or EC
+                                    ///////////////////////////////////////////////////////////////////////////////////
+                                    if (((alg.mask & ALG_RSA_KEY) == 0) ^ keyEntry.isRsa()) {
+                                        continue;
+                                    }
                                 }
                             }
+                            provisioning.abort((keyEntry.isSymmetric() ? "Symmetric" : keyEntry.isRsa() ? "RSA" : "EC") +
+                                    " key " + keyEntry.id + " does not match algorithm: " + algorithm);
                         }
-                        provisioning.abort((keyEntry.isSymmetric() ? "Symmetric" : keyEntry.isRsa() ? "RSA" : "EC") +
-                                " key " + keyEntry.id + " does not match algorithm: " + algorithm);
                     }
                 }
             }
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Post provisioning 1: Check that all the target keys are still there...
-        ///////////////////////////////////////////////////////////////////////////////////
-        for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
-            provisioning.getTargetKey(postOp.targetKeyEntry.keyHandle);
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Post provisioning 2: Perform operations
-        ///////////////////////////////////////////////////////////////////////////////////
-        for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
-            KeyEntry keyEntry = postOp.targetKeyEntry;
-            if (postOp.newKey == null) {
-                if (postOp.updateOrDelete) {
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    // postDeleteKey
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    localDeleteKey(keyEntry);
-                } else {
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    // postUnlockKey 
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    keyEntry.setErrorCounter((short) 0);
-                    if (keyEntry.pinPolicy.pukPolicy != null) {
-                        keyEntry.pinPolicy.pukPolicy.errorCount = 0;
-                    }
-                }
-            } else {
-                ///////////////////////////////////////////////////////////////////////////////////
-                // Inherit protection data from the old key but nothing else
-                ///////////////////////////////////////////////////////////////////////////////////
-                postOp.newKey.pinPolicy = keyEntry.pinPolicy;
-                postOp.newKey.pinValue = keyEntry.pinValue;
-                postOp.newKey.errorCount = keyEntry.errorCount;
-                postOp.newKey.devicePinProtection = keyEntry.devicePinProtection;
-
-                if (postOp.updateOrDelete) {
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    // postUpdateKey. Store new key in the place of the old
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    keys.put(keyEntry.keyHandle, postOp.newKey);
-
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Post provisioning 1: Check that all the target keys are still there...
+            ///////////////////////////////////////////////////////////////////////////////////
+            for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
+                provisioning.getTargetKey(postOp.targetKeyEntry.keyHandle);
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Post provisioning 2: Perform operations
+            ///////////////////////////////////////////////////////////////////////////////////
+            for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
+                KeyEntry keyEntry = postOp.targetKeyEntry;
+                if (postOp.newKey == null) {
+                    if (postOp.updateOrDelete) {
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        // postDeleteKey
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        localDeleteKey(keyEntry);
+                    } else {
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        // postUnlockKey 
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        keyEntry.setErrorCounter((short) 0);
+                        if (keyEntry.pinPolicy.pukPolicy != null) {
+                            keyEntry.pinPolicy.pukPolicy.errorCount = 0;
+                        }
+                    }
+                } else {
                     ///////////////////////////////////////////////////////////////////////////////////
-                    // Remove space occupied by the new key and restore old key handle
+                    // Inherit protection data from the old key but nothing else
                     ///////////////////////////////////////////////////////////////////////////////////
-                    keys.remove(postOp.newKey.keyHandle);
-                    postOp.newKey.keyHandle = keyEntry.keyHandle;
+                    postOp.newKey.pinPolicy = keyEntry.pinPolicy;
+                    postOp.newKey.pinValue = keyEntry.pinValue;
+                    postOp.newKey.errorCount = keyEntry.errorCount;
+                    postOp.newKey.devicePinProtection = keyEntry.devicePinProtection;
+    
+                    if (postOp.updateOrDelete) {
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        // postUpdateKey. Store new key in the place of the old
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        keys.put(keyEntry.keyHandle, postOp.newKey);
+    
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        // Remove space occupied by the new key and restore old key handle
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        keys.remove(postOp.newKey.keyHandle);
+                        postOp.newKey.keyHandle = keyEntry.keyHandle;
+                    }
                 }
             }
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Post provisioning 3: Take ownership of managed keys and their associates
-        ///////////////////////////////////////////////////////////////////////////////////
-        for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
-            Provisioning oldOwner = postOp.targetKeyEntry.owner;
-            if (oldOwner == provisioning) {
-                continue;
-            }
-            for (KeyEntry keyEntry : keys.values()) {
-                if (keyEntry.owner == oldOwner) {
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    // There was a key that required changed ownership
-                    ///////////////////////////////////////////////////////////////////////////////////
-                    keyEntry.owner = provisioning;
-                    if (keyEntry.pinPolicy != null) {
-                        ///////////////////////////////////////////////////////////////////////////////
-                        // Which also had a PIN policy...
-                        ///////////////////////////////////////////////////////////////////////////////
-                        keyEntry.pinPolicy.owner = provisioning;
-                        if (keyEntry.pinPolicy.pukPolicy != null) {
-                            ///////////////////////////////////////////////////////////////////////////
-                            // Which in turn had a PUK policy...
-                            ///////////////////////////////////////////////////////////////////////////
-                            keyEntry.pinPolicy.pukPolicy.owner = provisioning;
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Post provisioning 3: Take ownership of managed keys and their associates
+            ///////////////////////////////////////////////////////////////////////////////////
+            for (PostProvisioningObject postOp : provisioning.postProvisioningObjects) {
+                Provisioning oldOwner = postOp.targetKeyEntry.owner;
+                if (oldOwner == provisioning) {
+                    continue;
+                }
+                for (KeyEntry keyEntry : keys.values()) {
+                    if (keyEntry.owner == oldOwner) {
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        // There was a key that required changed ownership
+                        ///////////////////////////////////////////////////////////////////////////////////
+                        keyEntry.owner = provisioning;
+                        if (keyEntry.pinPolicy != null) {
+                            ///////////////////////////////////////////////////////////////////////////////
+                            // Which also had a PIN policy...
+                            ///////////////////////////////////////////////////////////////////////////////
+                            keyEntry.pinPolicy.owner = provisioning;
+                            if (keyEntry.pinPolicy.pukPolicy != null) {
+                                ///////////////////////////////////////////////////////////////////////////
+                                // Which in turn had a PUK policy...
+                                ///////////////////////////////////////////////////////////////////////////
+                                keyEntry.pinPolicy.pukPolicy.owner = provisioning;
+                            }
                         }
                     }
                 }
+                provisionings.remove(oldOwner.provisioningHandle);  // OK to perform also if already done
             }
-            provisionings.remove(oldOwner.provisioningHandle);  // OK to perform also if already done
+            provisioning.postProvisioningObjects.clear();  // No need to save
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // If there are no keys associated with the session we just delete it
+            ///////////////////////////////////////////////////////////////////////////////////
+            deleteEmptySession(provisioning);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // We are done, close the show for this time
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning.open = false;
+            return attestation;
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(provisioning, e);
+            return null;
         }
-        provisioning.postProvisioningObjects.clear();  // No need to save
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // If there are no keys associated with the session we just delete it
-        ///////////////////////////////////////////////////////////////////////////////////
-        deleteEmptySession(provisioning);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // We are done, close the show for this time
-        ///////////////////////////////////////////////////////////////////////////////////
-        provisioning.open = false;
-        return attestation;
     }
 
 
@@ -2668,7 +2650,8 @@ public synchronized ProvisioningSession createProvisioningSession(String session
                                                                       PublicKey keyManagementKey, // May be null
                                                                       int clientTime,
                                                                       int sessionLifeTime,
-                                                                      short sessionKeyLimit) throws SKSException {
+                                                                      short sessionKeyLimit,
+                                                                      byte[] serverCertificate) throws SKSException {
         ///////////////////////////////////////////////////////////////////////////////////
         // Check provisioning session algorithm compatibility
         ///////////////////////////////////////////////////////////////////////////////////
@@ -2770,6 +2753,7 @@ public synchronized ProvisioningSession createProvisioningSession(String session
                 ska.addInt(clientTime);
                 ska.addInt(sessionLifeTime);
                 ska.addShort(sessionKeyLimit);
+                ska.addArray(serverCertificate);
                 attestation = ska.getResult();
             } else {
                 ///////////////////////////////////////////////////////////////////////////////////
@@ -2788,6 +2772,7 @@ public synchronized ProvisioningSession createProvisioningSession(String session
                 pka.addInt(clientTime);
                 pka.addInt(sessionLifeTime);
                 pka.addShort(sessionKeyLimit);
+                pka.addArray(serverCertificate);
                 attestation = pka.getResult();
             }
         } catch (Exception e) {
@@ -2826,64 +2811,69 @@ public synchronized void addExtension(int keyHandle,
                                           String qualifier,
                                           byte[] extensionData,
                                           byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key and associated provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry keyEntry = getOpenKey(keyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Check for duplicates and length errors
-        ///////////////////////////////////////////////////////////////////////////////////
-        keyEntry.owner.rangeTest(subType, SUB_TYPE_EXTENSION, SUB_TYPE_LOGOTYPE, VAR_SUB_TYPE);
-        if (type.length() == 0 || type.length() > MAX_LENGTH_URI) {
-            keyEntry.owner.abort("URI length error: " + type.length());
-        }
-        if (keyEntry.extensions.get(type) != null) {
-            keyEntry.owner.abort("Duplicate \"" + VAR_TYPE + "\" : " + type);
-        }
-        if (extensionData.length > (subType == SUB_TYPE_ENCRYPTED_EXTENSION ?
-                MAX_LENGTH_EXTENSION_DATA + AES_CBC_PKCS5_PADDING : MAX_LENGTH_EXTENSION_DATA)) {
-            keyEntry.owner.abort("Extension data exceeds " + MAX_LENGTH_EXTENSION_DATA + " bytes");
-        }
-        byte[] binQualifier = getBinary(qualifier);
-        if (((subType == SUB_TYPE_LOGOTYPE) ^ (binQualifier.length != 0)) || binQualifier.length > MAX_LENGTH_QUALIFIER) {
-            keyEntry.owner.abort("\"" + VAR_QUALIFIER + "\" length error");
-        }
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Property bags are checked for not being empty or incorrectly formatted
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (subType == SUB_TYPE_PROPERTY_BAG) {
-            int i = 0;
-            do {
-                if (i > extensionData.length - 5 || getShort(extensionData, i) == 0 ||
-                        (i += getShort(extensionData, i) + 2) > extensionData.length - 3 ||
-                        ((extensionData[i++] & 0xFE) != 0) ||
-                        (i += getShort(extensionData, i) + 2) > extensionData.length) {
-                    keyEntry.owner.abort("\"" + VAR_PROPERTY_BAG + "\" format error: " + type);
+        KeyEntry keyEntry = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key and associated provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry = getOpenKey(keyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Check for duplicates and length errors
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry.owner.rangeTest(subType, SUB_TYPE_EXTENSION, SUB_TYPE_LOGOTYPE, VAR_SUB_TYPE);
+            if (type.length() == 0 || type.length() > MAX_LENGTH_URI) {
+                keyEntry.owner.abort("URI length error: " + type.length());
+            }
+            if (keyEntry.extensions.get(type) != null) {
+                keyEntry.owner.abort("Duplicate \"" + VAR_TYPE + "\" : " + type);
+            }
+            if (extensionData.length > (subType == SUB_TYPE_ENCRYPTED_EXTENSION ?
+                    MAX_LENGTH_EXTENSION_DATA + AES_CBC_PKCS5_PADDING : MAX_LENGTH_EXTENSION_DATA)) {
+                keyEntry.owner.abort("Extension data exceeds " + MAX_LENGTH_EXTENSION_DATA + " bytes");
+            }
+            byte[] binQualifier = getBinary(qualifier);
+            if (((subType == SUB_TYPE_LOGOTYPE) ^ (binQualifier.length != 0)) || binQualifier.length > MAX_LENGTH_QUALIFIER) {
+                keyEntry.owner.abort("\"" + VAR_QUALIFIER + "\" length error");
+            }
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Property bags are checked for not being empty or incorrectly formatted
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (subType == SUB_TYPE_PROPERTY_BAG) {
+                int i = 0;
+                do {
+                    if (i > extensionData.length - 5 || getShort(extensionData, i) == 0 ||
+                            (i += getShort(extensionData, i) + 2) > extensionData.length - 3 ||
+                            ((extensionData[i++] & 0xFE) != 0) ||
+                            (i += getShort(extensionData, i) + 2) > extensionData.length) {
+                        keyEntry.owner.abort("\"" + VAR_PROPERTY_BAG + "\" format error: " + type);
+                    }
                 }
+                while (i != extensionData.length);
             }
-            while (i != extensionData.length);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_ADD_EXTENSION);
+            verifier.addString(type);
+            verifier.addByte(subType);
+            verifier.addArray(binQualifier);
+            verifier.addBlob(extensionData);
+            keyEntry.owner.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Succeeded, create object
+            ///////////////////////////////////////////////////////////////////////////////////
+            ExtObject extension = new ExtObject();
+            extension.subType = subType;
+            extension.qualifier = qualifier;
+            extension.extensionData = (subType == SUB_TYPE_ENCRYPTED_EXTENSION) ?
+                    keyEntry.owner.decrypt(extensionData) : extensionData;
+            keyEntry.extensions.put(type, extension);
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(keyEntry, e);
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_ADD_EXTENSION);
-        verifier.addString(type);
-        verifier.addByte(subType);
-        verifier.addArray(binQualifier);
-        verifier.addBlob(extensionData);
-        keyEntry.owner.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Succeeded, create object
-        ///////////////////////////////////////////////////////////////////////////////////
-        ExtObject extension = new ExtObject();
-        extension.subType = subType;
-        extension.qualifier = qualifier;
-        extension.extensionData = (subType == SUB_TYPE_ENCRYPTED_EXTENSION) ?
-                keyEntry.owner.decrypt(extensionData) : extensionData;
-        keyEntry.extensions.put(type, extension);
     }
 
 
@@ -2896,35 +2886,36 @@ public synchronized void addExtension(int keyHandle,
     public synchronized void importPrivateKey(int keyHandle,
                                               byte[] encryptedKey,
                                               byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key and associated provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry keyEntry = getOpenKey(keyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Check for key length errors
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (encryptedKey.length > (MAX_LENGTH_CRYPTO_DATA + AES_CBC_PKCS5_PADDING)) {
-            keyEntry.owner.abort("Private key: " + keyEntry.id + " exceeds " + MAX_LENGTH_CRYPTO_DATA + " bytes");
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_IMPORT_PRIVATE_KEY);
-        verifier.addArray(encryptedKey);
-        keyEntry.owner.verifyMac(verifier, mac);
-
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Mark as "copied" by the server
-        ///////////////////////////////////////////////////////////////////////////////////
-        keyEntry.setAndVerifyServerBackupFlag();
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Decrypt and store private key
-        ///////////////////////////////////////////////////////////////////////////////////
+        KeyEntry keyEntry = null;
         try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key and associated provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry = getOpenKey(keyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Check for key length errors
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (encryptedKey.length > (MAX_LENGTH_CRYPTO_DATA + AES_CBC_PKCS5_PADDING)) {
+                keyEntry.owner.abort("Private key: " + keyEntry.id + " exceeds " + MAX_LENGTH_CRYPTO_DATA + " bytes");
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_IMPORT_PRIVATE_KEY);
+            verifier.addArray(encryptedKey);
+            keyEntry.owner.verifyMac(verifier, mac);
+    
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Mark as "copied" by the server
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry.setAndVerifyServerBackupFlag();
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Decrypt and store private key
+            ///////////////////////////////////////////////////////////////////////////////////
             byte[] pkcs8PrivateKey = keyEntry.owner.decrypt(encryptedKey);
             PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(pkcs8PrivateKey);
 
@@ -2949,8 +2940,8 @@ public synchronized void importPrivateKey(int keyHandle,
             } else {
                 checkEcKeyCompatibility((ECPrivateKey) keyEntry.privateKey, keyEntry.owner, keyEntry.id);
             }
-        } catch (GeneralSecurityException e) {
-            keyEntry.owner.abort(e.getMessage(), SKSException.ERROR_CRYPTO);
+        } catch (GeneralSecurityException | IOException e) {
+            tearDownSession(keyEntry, e);
         }
     }
 
@@ -2964,34 +2955,40 @@ public synchronized void importPrivateKey(int keyHandle,
     public synchronized void importSymmetricKey(int keyHandle,
                                                 byte[] encryptedKey,
                                                 byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key and associated provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry keyEntry = getOpenKey(keyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Check for various input errors
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (encryptedKey.length > (MAX_LENGTH_SYMMETRIC_KEY + AES_CBC_PKCS5_PADDING)) {
-            keyEntry.owner.abort("Symmetric key: " + keyEntry.id + " exceeds " + MAX_LENGTH_SYMMETRIC_KEY + " bytes");
+        KeyEntry keyEntry = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key and associated provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry = getOpenKey(keyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Check for various input errors
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (encryptedKey.length > (MAX_LENGTH_SYMMETRIC_KEY + AES_CBC_PKCS5_PADDING)) {
+                keyEntry.owner.abort("Symmetric key: " + keyEntry.id + " exceeds " +
+                                     MAX_LENGTH_SYMMETRIC_KEY + " bytes");
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Mark as "copied" by the server
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry.setAndVerifyServerBackupFlag();
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_IMPORT_SYMMETRIC_KEY);
+            verifier.addArray(encryptedKey);
+            keyEntry.owner.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Decrypt and store symmetric key
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry.symmetricKey = keyEntry.owner.decrypt(encryptedKey);
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(keyEntry, e);
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Mark as "copied" by the server
-        ///////////////////////////////////////////////////////////////////////////////////
-        keyEntry.setAndVerifyServerBackupFlag();
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = keyEntry.getEeCertMacBuilder(METHOD_IMPORT_SYMMETRIC_KEY);
-        verifier.addArray(encryptedKey);
-        keyEntry.owner.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Decrypt and store symmetric key
-        ///////////////////////////////////////////////////////////////////////////////////
-        keyEntry.symmetricKey = keyEntry.owner.decrypt(encryptedKey);
     }
 
 
@@ -3004,16 +3001,17 @@ public synchronized void importSymmetricKey(int keyHandle,
     public synchronized void setCertificatePath(int keyHandle,
                                                 X509Certificate[] certificatePath,
                                                 byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get key and associated provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        KeyEntry keyEntry = getOpenKey(keyHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = keyEntry.owner.getMacBuilderForMethodCall(METHOD_SET_CERTIFICATE_PATH);
+        KeyEntry keyEntry = null;
         try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get key and associated provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry = getOpenKey(keyHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = keyEntry.owner.getMacBuilderForMethodCall(METHOD_SET_CERTIFICATE_PATH);
             verifier.addArray(keyEntry.publicKey.getEncoded());
             verifier.addString(keyEntry.id);
             for (X509Certificate certificate : certificatePath) {
@@ -3023,34 +3021,34 @@ public synchronized void setCertificatePath(int keyHandle,
                 }
                 verifier.addArray(der);
             }
-        } catch (GeneralSecurityException e) {
-            keyEntry.owner.abort(e.getMessage(), SKSException.ERROR_INTERNAL);
-        }
-        keyEntry.owner.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Update public key value.  It has no use after "setCertificatePath" anyway...
-        ///////////////////////////////////////////////////////////////////////////////////
-        keyEntry.publicKey = certificatePath[0].getPublicKey();
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Check key material for SKS compliance
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (keyEntry.publicKey instanceof RSAPublicKey) {
-            checkRsaKeyCompatibility(getRSAKeySize((RSAPublicKey) keyEntry.publicKey),
-                                     ((RSAPublicKey) keyEntry.publicKey).getPublicExponent(),
-                                     keyEntry.owner, keyEntry.id);
-        } else {
-            checkEcKeyCompatibility((ECPublicKey) keyEntry.publicKey, keyEntry.owner, keyEntry.id);
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Store certificate path
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (keyEntry.certificatePath != null) {
-            keyEntry.owner.abort("Multiple calls to \"setCertificatePath\" for: " + keyEntry.id);
+            keyEntry.owner.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Update public key value.  It has no use after "setCertificatePath" anyway...
+            ///////////////////////////////////////////////////////////////////////////////////
+            keyEntry.publicKey = certificatePath[0].getPublicKey();
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Check key material for SKS compliance
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (keyEntry.publicKey instanceof RSAPublicKey) {
+                checkRsaKeyCompatibility(getRSAKeySize((RSAPublicKey) keyEntry.publicKey),
+                                         ((RSAPublicKey) keyEntry.publicKey).getPublicExponent(),
+                                         keyEntry.owner, keyEntry.id);
+            } else {
+                checkEcKeyCompatibility((ECPublicKey) keyEntry.publicKey, keyEntry.owner, keyEntry.id);
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Store certificate path
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (keyEntry.certificatePath != null) {
+                keyEntry.owner.abort("Multiple calls to \"setCertificatePath\" for: " + keyEntry.id);
+            }
+            keyEntry.certificatePath = certificatePath.clone();
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(keyEntry, e);
         }
-        keyEntry.certificatePath = certificatePath.clone();
     }
 
 
@@ -3077,155 +3075,156 @@ public synchronized KeyData createKeyEntry(int provisioningHandle,
                                                byte[] keyParameters,
                                                String[] endorsedAlgorithms,
                                                byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Validate input as much as possible
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (!keyEntryAlgorithm.equals(ALGORITHM_KEY_ATTEST_1)) {
-            provisioning.abort("Unknown \"" + VAR_KEY_ENTRY_ALGORITHM + "\" : " + keyEntryAlgorithm, SKSException.ERROR_ALGORITHM);
-        }
-        Algorithm kalg = supportedAlgorithms.get(keyAlgorithm);
-        if (kalg == null || (kalg.mask & ALG_KEY_GEN) == 0) {
-            provisioning.abort("Unsupported \"" + VAR_KEY_ALGORITHM + "\": " + keyAlgorithm);
-        }
-        if ((kalg.mask & ALG_KEY_PARM) == 0 ^ keyParameters == null) {
-            provisioning.abort((keyParameters == null ? "Missing" : "Unexpected") + " \"" + VAR_KEY_PARAMETERS + "\"");
-        }
-        if (serverSeed == null) {
-            serverSeed = ZERO_LENGTH_ARRAY;
-        } else if (serverSeed.length > MAX_LENGTH_SERVER_SEED) {
-            provisioning.abort("\"" + VAR_SERVER_SEED + "\" length error: " + serverSeed.length);
-        }
-        provisioning.rangeTest(exportProtection, EXPORT_DELETE_PROTECTION_NONE, EXPORT_DELETE_PROTECTION_NOT_ALLOWED, VAR_EXPORT_PROTECTION);
-        provisioning.rangeTest(deleteProtection, EXPORT_DELETE_PROTECTION_NONE, EXPORT_DELETE_PROTECTION_NOT_ALLOWED, VAR_DELETE_PROTECTION);
-        provisioning.rangeTest(appUsage, APP_USAGE_SIGNATURE, APP_USAGE_UNIVERSAL, VAR_APP_USAGE);
-        provisioning.rangeTest(biometricProtection, BIOMETRIC_PROTECTION_NONE, BIOMETRIC_PROTECTION_EXCLUSIVE, VAR_BIOMETRIC_PROTECTION);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get proper PIN policy ID
-        ///////////////////////////////////////////////////////////////////////////////////
-        PINPolicy pinPolicy = null;
-        boolean decryptPin = false;
-        String pinPolicyId = CRYPTO_STRING_NOT_AVAILABLE;
-        boolean pinProtection = true;
-        if (devicePinProtection) {
-            if (SKS_DEVICE_PIN_SUPPORT) {
-                if (pinPolicyHandle != 0) {
-                    provisioning.abort("Device PIN mixed with PIN policy ojbect");
+        Provisioning provisioning = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning = getOpenProvisioningSession(provisioningHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Validate input as much as possible
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (!keyEntryAlgorithm.equals(ALGORITHM_KEY_ATTEST_1)) {
+                provisioning.abort("Unknown \"" + VAR_KEY_ENTRY_ALGORITHM + "\" : " + keyEntryAlgorithm, SKSException.ERROR_ALGORITHM);
+            }
+            Algorithm kalg = supportedAlgorithms.get(keyAlgorithm);
+            if (kalg == null || (kalg.mask & ALG_KEY_GEN) == 0) {
+                provisioning.abort("Unsupported \"" + VAR_KEY_ALGORITHM + "\": " + keyAlgorithm);
+            }
+            if ((kalg.mask & ALG_KEY_PARM) == 0 ^ keyParameters == null) {
+                provisioning.abort((keyParameters == null ? "Missing" : "Unexpected") + " \"" + VAR_KEY_PARAMETERS + "\"");
+            }
+            if (serverSeed == null) {
+                serverSeed = ZERO_LENGTH_ARRAY;
+            } else if (serverSeed.length > MAX_LENGTH_SERVER_SEED) {
+                provisioning.abort("\"" + VAR_SERVER_SEED + "\" length error: " + serverSeed.length);
+            }
+            provisioning.rangeTest(exportProtection, EXPORT_DELETE_PROTECTION_NONE, EXPORT_DELETE_PROTECTION_NOT_ALLOWED, VAR_EXPORT_PROTECTION);
+            provisioning.rangeTest(deleteProtection, EXPORT_DELETE_PROTECTION_NONE, EXPORT_DELETE_PROTECTION_NOT_ALLOWED, VAR_DELETE_PROTECTION);
+            provisioning.rangeTest(appUsage, APP_USAGE_SIGNATURE, APP_USAGE_UNIVERSAL, VAR_APP_USAGE);
+            provisioning.rangeTest(biometricProtection, BIOMETRIC_PROTECTION_NONE, BIOMETRIC_PROTECTION_EXCLUSIVE, VAR_BIOMETRIC_PROTECTION);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get proper PIN policy ID
+            ///////////////////////////////////////////////////////////////////////////////////
+            PINPolicy pinPolicy = null;
+            boolean decryptPin = false;
+            String pinPolicyId = CRYPTO_STRING_NOT_AVAILABLE;
+            boolean pinProtection = true;
+            if (devicePinProtection) {
+                if (SKS_DEVICE_PIN_SUPPORT) {
+                    if (pinPolicyHandle != 0) {
+                        provisioning.abort("Device PIN mixed with PIN policy ojbect");
+                    }
+                } else {
+                    provisioning.abort("Unsupported: \"" + VAR_DEVICE_PIN_PROTECTION + "\"");
+                }
+            } else if (pinPolicyHandle != 0) {
+                pinPolicy = pinPolicies.get(pinPolicyHandle);
+                if (pinPolicy == null || pinPolicy.owner != provisioning) {
+                    provisioning.abort("Referenced PIN policy object not found");
+                }
+                if (enablePinCaching && pinPolicy.inputMethod != INPUT_METHOD_TRUSTED_GUI) {
+                    provisioning.abort("\"" + VAR_ENABLE_PIN_CACHING + "\" must be combined with \"trusted-gui\"");
                 }
+                pinPolicyId = pinPolicy.id;
+                provisioning.names.put(pinPolicyId, true); // Referenced
+                decryptPin = !pinPolicy.userDefined;
             } else {
-                provisioning.abort("Unsupported: \"" + VAR_DEVICE_PIN_PROTECTION + "\"");
-            }
-        } else if (pinPolicyHandle != 0) {
-            pinPolicy = pinPolicies.get(pinPolicyHandle);
-            if (pinPolicy == null || pinPolicy.owner != provisioning) {
-                provisioning.abort("Referenced PIN policy object not found");
-            }
-            if (enablePinCaching && pinPolicy.inputMethod != INPUT_METHOD_TRUSTED_GUI) {
-                provisioning.abort("\"" + VAR_ENABLE_PIN_CACHING + "\" must be combined with \"trusted-gui\"");
-            }
-            pinPolicyId = pinPolicy.id;
-            provisioning.names.put(pinPolicyId, true); // Referenced
-            decryptPin = !pinPolicy.userDefined;
-        } else {
-            verifyExportDeleteProtection(deleteProtection, EXPORT_DELETE_PROTECTION_PIN, provisioning);
-            verifyExportDeleteProtection(exportProtection, EXPORT_DELETE_PROTECTION_PIN, provisioning);
-            pinProtection = false;
-            if (enablePinCaching) {
-                provisioning.abort("\"" + VAR_ENABLE_PIN_CACHING + "\" without PIN");
+                verifyExportDeleteProtection(deleteProtection, EXPORT_DELETE_PROTECTION_PIN, provisioning);
+                verifyExportDeleteProtection(exportProtection, EXPORT_DELETE_PROTECTION_PIN, provisioning);
+                pinProtection = false;
+                if (enablePinCaching) {
+                    provisioning.abort("\"" + VAR_ENABLE_PIN_CACHING + "\" without PIN");
+                }
+                if (pinValue != null) {
+                    provisioning.abort("\"" + VAR_PIN_VALUE + "\" expected to be empty");
+                }
             }
-            if (pinValue != null) {
-                provisioning.abort("\"" + VAR_PIN_VALUE + "\" expected to be empty");
+            if (biometricProtection != BIOMETRIC_PROTECTION_NONE &&
+                    ((biometricProtection != BIOMETRIC_PROTECTION_EXCLUSIVE) ^ pinProtection)) {
+                provisioning.abort("Invalid \"" + VAR_BIOMETRIC_PROTECTION + "\" and PIN combination");
             }
-        }
-        if (biometricProtection != BIOMETRIC_PROTECTION_NONE &&
-                ((biometricProtection != BIOMETRIC_PROTECTION_EXCLUSIVE) ^ pinProtection)) {
-            provisioning.abort("Invalid \"" + VAR_BIOMETRIC_PROTECTION + "\" and PIN combination");
-        }
-        if (pinPolicy == null || pinPolicy.pukPolicy == null) {
-            verifyExportDeleteProtection(deleteProtection, EXPORT_DELETE_PROTECTION_PUK, provisioning);
-            verifyExportDeleteProtection(exportProtection, EXPORT_DELETE_PROTECTION_PUK, provisioning);
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_KEY_ENTRY);
-        verifier.addString(id);
-        verifier.addString(keyEntryAlgorithm);
-        verifier.addArray(serverSeed);
-        verifier.addString(pinPolicyId);
-        if (decryptPin) {
-            verifier.addArray(pinValue);
-            pinValue = provisioning.decrypt(pinValue);
-        } else {
-            if (pinValue != null) {
-                pinValue = pinValue.clone();
+            if (pinPolicy == null || pinPolicy.pukPolicy == null) {
+                verifyExportDeleteProtection(deleteProtection, EXPORT_DELETE_PROTECTION_PUK, provisioning);
+                verifyExportDeleteProtection(exportProtection, EXPORT_DELETE_PROTECTION_PUK, provisioning);
             }
-            verifier.addString(CRYPTO_STRING_NOT_AVAILABLE);
-        }
-        verifier.addBool(devicePinProtection);
-        verifier.addBool(enablePinCaching);
-        verifier.addByte(biometricProtection);
-        verifier.addByte(exportProtection);
-        verifier.addByte(deleteProtection);
-        verifier.addByte(appUsage);
-        verifier.addString(friendlyName == null ? "" : friendlyName);
-        verifier.addString(keyAlgorithm);
-        verifier.addArray(keyParameters == null ? ZERO_LENGTH_ARRAY : keyParameters);
-        LinkedHashSet<String> tempEndorsed = new LinkedHashSet<String>();
-        String prevAlg = "\0";
-        for (String endorsedAlgorithm : endorsedAlgorithms) {
+    
             ///////////////////////////////////////////////////////////////////////////////////
-            // Check that the algorithms are sorted and known
+            // Verify incoming MAC
             ///////////////////////////////////////////////////////////////////////////////////
-            if (prevAlg.compareTo(endorsedAlgorithm) >= 0) {
-                provisioning.abort("Duplicate or incorrectly sorted algorithm: " + endorsedAlgorithm);
-            }
-            Algorithm alg = supportedAlgorithms.get(endorsedAlgorithm);
-            if (alg == null || alg.mask == 0) {
-                provisioning.abort("Unsupported algorithm: " + endorsedAlgorithm);
+            MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_KEY_ENTRY);
+            verifier.addString(id);
+            verifier.addString(keyEntryAlgorithm);
+            verifier.addArray(serverSeed);
+            verifier.addString(pinPolicyId);
+            if (decryptPin) {
+                verifier.addArray(pinValue);
+                pinValue = provisioning.decrypt(pinValue);
+            } else {
+                if (pinValue != null) {
+                    pinValue = pinValue.clone();
+                }
+                verifier.addString(CRYPTO_STRING_NOT_AVAILABLE);
+            }
+            verifier.addBool(devicePinProtection);
+            verifier.addBool(enablePinCaching);
+            verifier.addByte(biometricProtection);
+            verifier.addByte(exportProtection);
+            verifier.addByte(deleteProtection);
+            verifier.addByte(appUsage);
+            verifier.addString(friendlyName == null ? "" : friendlyName);
+            verifier.addString(keyAlgorithm);
+            verifier.addArray(keyParameters == null ? ZERO_LENGTH_ARRAY : keyParameters);
+            LinkedHashSet<String> tempEndorsed = new LinkedHashSet<String>();
+            String prevAlg = "\0";
+            for (String endorsedAlgorithm : endorsedAlgorithms) {
+                ///////////////////////////////////////////////////////////////////////////////////
+                // Check that the algorithms are sorted and known
+                ///////////////////////////////////////////////////////////////////////////////////
+                if (prevAlg.compareTo(endorsedAlgorithm) >= 0) {
+                    provisioning.abort("Duplicate or incorrectly sorted algorithm: " + endorsedAlgorithm);
+                }
+                Algorithm alg = supportedAlgorithms.get(endorsedAlgorithm);
+                if (alg == null || alg.mask == 0) {
+                    provisioning.abort("Unsupported algorithm: " + endorsedAlgorithm);
+                }
+                if ((alg.mask & ALG_NONE) != 0 && endorsedAlgorithms.length > 1) {
+                    provisioning.abort("Algorithm must be alone: " + endorsedAlgorithm);
+                }
+                tempEndorsed.add(prevAlg = endorsedAlgorithm);
+                verifier.addString(endorsedAlgorithm);
             }
-            if ((alg.mask & ALG_NONE) != 0 && endorsedAlgorithms.length > 1) {
-                provisioning.abort("Algorithm must be alone: " + endorsedAlgorithm);
+            provisioning.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Perform a gazillion tests on PINs if applicable
+            ///////////////////////////////////////////////////////////////////////////////////
+            if (pinPolicy != null) {
+                ///////////////////////////////////////////////////////////////////////////////////
+                // Testing the actual PIN value
+                ///////////////////////////////////////////////////////////////////////////////////
+                verifyPinPolicyCompliance(false, pinValue, pinPolicy, appUsage, provisioning);
             }
-            tempEndorsed.add(prevAlg = endorsedAlgorithm);
-            verifier.addString(endorsedAlgorithm);
-        }
-        provisioning.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Perform a gazillion tests on PINs if applicable
-        ///////////////////////////////////////////////////////////////////////////////////
-        if (pinPolicy != null) {
+    
             ///////////////////////////////////////////////////////////////////////////////////
-            // Testing the actual PIN value
+            // Decode key algorithm specifier
             ///////////////////////////////////////////////////////////////////////////////////
-            verifyPinPolicyCompliance(false, pinValue, pinPolicy, appUsage, provisioning);
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Decode key algorithm specifier
-        ///////////////////////////////////////////////////////////////////////////////////
-        AlgorithmParameterSpec algParSpec = null;
-        if ((kalg.mask & ALG_RSA_KEY) == ALG_RSA_KEY) {
-            int rsaKeySize = kalg.mask & ALG_RSA_GMSK;
-            BigInteger exponent = RSAKeyGenParameterSpec.F4;
-            if (keyParameters != null) {
-                if (keyParameters.length == 0 || keyParameters.length > 8) {
-                    provisioning.abort("\"" + VAR_KEY_PARAMETERS + "\" length error: " + keyParameters.length);
+            AlgorithmParameterSpec algParSpec = null;
+            if ((kalg.mask & ALG_RSA_KEY) == ALG_RSA_KEY) {
+                int rsaKeySize = kalg.mask & ALG_RSA_GMSK;
+                BigInteger exponent = RSAKeyGenParameterSpec.F4;
+                if (keyParameters != null) {
+                    if (keyParameters.length == 0 || keyParameters.length > 8) {
+                        provisioning.abort("\"" + VAR_KEY_PARAMETERS + "\" length error: " + keyParameters.length);
+                    }
+                    exponent = new BigInteger(keyParameters);
                 }
-                exponent = new BigInteger(keyParameters);
+                algParSpec = new RSAKeyGenParameterSpec(rsaKeySize, exponent);
+            } else {
+                algParSpec = new ECGenParameterSpec(kalg.jceName);
             }
-            algParSpec = new RSAKeyGenParameterSpec(rsaKeySize, exponent);
-        } else {
-            algParSpec = new ECGenParameterSpec(kalg.jceName);
-        }
-        try {
             ///////////////////////////////////////////////////////////////////////////////////
             // At last, generate the desired key-pair
             ///////////////////////////////////////////////////////////////////////////////////
@@ -3240,8 +3239,8 @@ public synchronized KeyData createKeyEntry(int provisioningHandle,
             // Create key attest
             ///////////////////////////////////////////////////////////////////////////////////
             MacBuilder cka = provisioning.getMacBuilderForMethodCall(KDF_DEVICE_ATTESTATION);
-            cka.addString(id);
             cka.addArray(publicKey.getEncoded());
+            cka.addArrayCore(verifier.getData());
             byte[] attestation = cka.getResult();
 
             ///////////////////////////////////////////////////////////////////////////////////
@@ -3262,8 +3261,8 @@ public synchronized KeyData createKeyEntry(int provisioningHandle,
             keyEntry.deleteProtection = deleteProtection;
             keyEntry.endorsedAlgorithms = tempEndorsed;
             return new KeyData(keyEntry.keyHandle, publicKey, attestation);
-        } catch (GeneralSecurityException e) {
-            provisioning.abort(e.getMessage(), SKSException.ERROR_INTERNAL);
+        } catch (GeneralSecurityException | IOException e) {
+            tearDownSession(provisioning, e);
         }
         return null;    // For the compiler only...
     }
@@ -3288,75 +3287,81 @@ public synchronized int createPinPolicy(int provisioningHandle,
                                             short maxLength,
                                             byte inputMethod,
                                             byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Perform PIN "sanity" checks
-        ///////////////////////////////////////////////////////////////////////////////////
-        provisioning.rangeTest(grouping, PIN_GROUPING_NONE, PIN_GROUPING_UNIQUE, VAR_GROUPING);
-        provisioning.rangeTest(inputMethod, INPUT_METHOD_ANY, INPUT_METHOD_TRUSTED_GUI, VAR_INPUT_METHOD);
-        provisioning.passphraseFormatTest(format);
-        provisioning.retryLimitTest(retryLimit, (short) 1);
-        if ((patternRestrictions & ~(PIN_PATTERN_TWO_IN_A_ROW |
-                                     PIN_PATTERN_THREE_IN_A_ROW |
-                                     PIN_PATTERN_SEQUENCE |
-                                     PIN_PATTERN_REPEATED |
-                                     PIN_PATTERN_MISSING_GROUP)) != 0) {
-            provisioning.abort("Invalid \"" + VAR_PATTERN_RESTRICTIONS + "\" value=" + patternRestrictions);
-        }
-        String pukPolicyId = CRYPTO_STRING_NOT_AVAILABLE;
-        PUKPolicy pukPolicy = null;
-        if (pukPolicyHandle != 0) {
-            pukPolicy = pukPolicies.get(pukPolicyHandle);
-            if (pukPolicy == null || pukPolicy.owner != provisioning) {
-                provisioning.abort("Referenced PUK policy object not found");
+        Provisioning provisioning = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning = getOpenProvisioningSession(provisioningHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Perform PIN "sanity" checks
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning.rangeTest(grouping, PIN_GROUPING_NONE, PIN_GROUPING_UNIQUE, VAR_GROUPING);
+            provisioning.rangeTest(inputMethod, INPUT_METHOD_ANY, INPUT_METHOD_TRUSTED_GUI, VAR_INPUT_METHOD);
+            provisioning.passphraseFormatTest(format);
+            provisioning.retryLimitTest(retryLimit, (short) 1);
+            if ((patternRestrictions & ~(PIN_PATTERN_TWO_IN_A_ROW |
+                                         PIN_PATTERN_THREE_IN_A_ROW |
+                                         PIN_PATTERN_SEQUENCE |
+                                         PIN_PATTERN_REPEATED |
+                                         PIN_PATTERN_MISSING_GROUP)) != 0) {
+                provisioning.abort("Invalid \"" + VAR_PATTERN_RESTRICTIONS + "\" value=" + patternRestrictions);
+            }
+            String pukPolicyId = CRYPTO_STRING_NOT_AVAILABLE;
+            PUKPolicy pukPolicy = null;
+            if (pukPolicyHandle != 0) {
+                pukPolicy = pukPolicies.get(pukPolicyHandle);
+                if (pukPolicy == null || pukPolicy.owner != provisioning) {
+                    provisioning.abort("Referenced PUK policy object not found");
+                }
+                pukPolicyId = pukPolicy.id;
+                provisioning.names.put(pukPolicyId, true); // Referenced
             }
-            pukPolicyId = pukPolicy.id;
-            provisioning.names.put(pukPolicyId, true); // Referenced
-        }
-        if ((patternRestrictions & PIN_PATTERN_MISSING_GROUP) != 0 &&
-                format != PASSPHRASE_FORMAT_ALPHANUMERIC && format != PASSPHRASE_FORMAT_STRING) {
-            provisioning.abort("Incorrect \"" + VAR_FORMAT + "\" for the \"missing-group\" PIN pattern policy");
-        }
-        if (minLength < 1 || maxLength > MAX_LENGTH_PIN_PUK || maxLength < minLength) {
-            provisioning.abort("PIN policy length error");
+            if ((patternRestrictions & PIN_PATTERN_MISSING_GROUP) != 0 &&
+                    format != PASSPHRASE_FORMAT_ALPHANUMERIC && format != PASSPHRASE_FORMAT_STRING) {
+                provisioning.abort("Incorrect \"" + VAR_FORMAT + "\" for the \"missing-group\" PIN pattern policy");
+            }
+            if (minLength < 1 || maxLength > MAX_LENGTH_PIN_PUK || maxLength < minLength) {
+                provisioning.abort("PIN policy length error");
+            }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_PIN_POLICY);
+            verifier.addString(id);
+            verifier.addString(pukPolicyId);
+            verifier.addBool(userDefined);
+            verifier.addBool(userModifiable);
+            verifier.addByte(format);
+            verifier.addShort(retryLimit);
+            verifier.addByte(grouping);
+            verifier.addByte(patternRestrictions);
+            verifier.addShort(minLength);
+            verifier.addShort(maxLength);
+            verifier.addByte(inputMethod);
+            provisioning.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Success, create object
+            ///////////////////////////////////////////////////////////////////////////////////
+            PINPolicy pinPolicy = new PINPolicy(provisioning, id);
+            pinPolicy.pukPolicy = pukPolicy;
+            pinPolicy.userDefined = userDefined;
+            pinPolicy.userModifiable = userModifiable;
+            pinPolicy.format = format;
+            pinPolicy.retryLimit = retryLimit;
+            pinPolicy.grouping = grouping;
+            pinPolicy.patternRestrictions = patternRestrictions;
+            pinPolicy.minLength = minLength;
+            pinPolicy.maxLength = maxLength;
+            pinPolicy.inputMethod = inputMethod;
+            return pinPolicy.pinPolicyHandle;
+        } catch (IOException | GeneralSecurityException e){
+            tearDownSession(provisioning, e);
+            return 0;  // For the compiler...
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_PIN_POLICY);
-        verifier.addString(id);
-        verifier.addString(pukPolicyId);
-        verifier.addBool(userDefined);
-        verifier.addBool(userModifiable);
-        verifier.addByte(format);
-        verifier.addShort(retryLimit);
-        verifier.addByte(grouping);
-        verifier.addByte(patternRestrictions);
-        verifier.addShort(minLength);
-        verifier.addShort(maxLength);
-        verifier.addByte(inputMethod);
-        provisioning.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Success, create object
-        ///////////////////////////////////////////////////////////////////////////////////
-        PINPolicy pinPolicy = new PINPolicy(provisioning, id);
-        pinPolicy.pukPolicy = pukPolicy;
-        pinPolicy.userDefined = userDefined;
-        pinPolicy.userModifiable = userModifiable;
-        pinPolicy.format = format;
-        pinPolicy.retryLimit = retryLimit;
-        pinPolicy.grouping = grouping;
-        pinPolicy.patternRestrictions = patternRestrictions;
-        pinPolicy.minLength = minLength;
-        pinPolicy.maxLength = maxLength;
-        pinPolicy.inputMethod = inputMethod;
-        return pinPolicy.pinPolicyHandle;
     }
 
 
@@ -3372,45 +3377,51 @@ public synchronized int createPukPolicy(int provisioningHandle,
                                             byte format,
                                             short retryLimit,
                                             byte[] mac) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Perform PUK "sanity" checks
-        ///////////////////////////////////////////////////////////////////////////////////
-        provisioning.passphraseFormatTest(format);
-        provisioning.retryLimitTest(retryLimit, (short) 0);
-        byte[] decryptedPukValue = provisioning.decrypt(pukValue);
-        if (decryptedPukValue.length == 0 || decryptedPukValue.length > MAX_LENGTH_PIN_PUK) {
-            provisioning.abort("PUK length error");
-        }
-        for (int i = 0; i < decryptedPukValue.length; i++) {
-            byte c = decryptedPukValue[i];
-            if ((c < '0' || c > '9') && (format == PASSPHRASE_FORMAT_NUMERIC ||
-                    ((c < 'A' || c > 'Z') && format == PASSPHRASE_FORMAT_ALPHANUMERIC))) {
-                provisioning.abort("PUK syntax error");
+        Provisioning provisioning = null;
+        try {
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Get provisioning session
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning = getOpenProvisioningSession(provisioningHandle);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Perform PUK "sanity" checks
+            ///////////////////////////////////////////////////////////////////////////////////
+            provisioning.passphraseFormatTest(format);
+            provisioning.retryLimitTest(retryLimit, (short) 0);
+            byte[] decryptedPukValue = provisioning.decrypt(pukValue);
+            if (decryptedPukValue.length == 0 || decryptedPukValue.length > MAX_LENGTH_PIN_PUK) {
+                provisioning.abort("PUK length error");
+            }
+            for (int i = 0; i < decryptedPukValue.length; i++) {
+                byte c = decryptedPukValue[i];
+                if ((c < '0' || c > '9') && (format == PASSPHRASE_FORMAT_NUMERIC ||
+                        ((c < 'A' || c > 'Z') && format == PASSPHRASE_FORMAT_ALPHANUMERIC))) {
+                    provisioning.abort("PUK syntax error");
+                }
             }
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Verify incoming MAC
+            ///////////////////////////////////////////////////////////////////////////////////
+            MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_PUK_POLICY);
+            verifier.addString(id);
+            verifier.addArray(pukValue);
+            verifier.addByte(format);
+            verifier.addShort(retryLimit);
+            provisioning.verifyMac(verifier, mac);
+    
+            ///////////////////////////////////////////////////////////////////////////////////
+            // Success, create object
+            ///////////////////////////////////////////////////////////////////////////////////
+            PUKPolicy pukPolicy = new PUKPolicy(provisioning, id);
+            pukPolicy.pukValue = decryptedPukValue;
+            pukPolicy.format = format;
+            pukPolicy.retryLimit = retryLimit;
+            return pukPolicy.pukPolicyHandle;
+        } catch (IOException | GeneralSecurityException e) {
+            tearDownSession(provisioning, e);
+            return 0;  // For the compiler...
         }
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Verify incoming MAC
-        ///////////////////////////////////////////////////////////////////////////////////
-        MacBuilder verifier = provisioning.getMacBuilderForMethodCall(METHOD_CREATE_PUK_POLICY);
-        verifier.addString(id);
-        verifier.addArray(pukValue);
-        verifier.addByte(format);
-        verifier.addShort(retryLimit);
-        provisioning.verifyMac(verifier, mac);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Success, create object
-        ///////////////////////////////////////////////////////////////////////////////////
-        PUKPolicy pukPolicy = new PUKPolicy(provisioning, id);
-        pukPolicy.pukValue = decryptedPukValue;
-        pukPolicy.format = format;
-        pukPolicy.retryLimit = retryLimit;
-        return pukPolicy.pukPolicyHandle;
     }
 }
diff --git a/library/test/org/webpki/sks/SKSTest.java b/library/test/org/webpki/sks/SKSTest.java
index c78a6d7d..67260102 100644
--- a/library/test/org/webpki/sks/SKSTest.java
+++ b/library/test/org/webpki/sks/SKSTest.java
@@ -103,6 +103,8 @@ public class SKSTest {
     static Device device;
 
     static boolean bc_loaded;
+    
+    static byte[] serverCertificate = {1,2,3};
 
     @BeforeClass
     public static void openFile() throws Exception {
@@ -2951,12 +2953,8 @@ public void test73() throws Exception {
     }
 
     @Test
-    public void test74() throws Exception {
-        ProvSess sess = new ProvSess(device);
-        assertTrue("Signature error",
-                ArrayUtil.compare(device.sks.signProvisioningSessionData(sess.provisioning_handle, TEST_STRING),
-                        sess.serverSessionSign(TEST_STRING)));
-        sess.closeSession();
+    public void test74() {
+//TODO        
     }
 
     @Test
diff --git a/library/test/org/webpki/sks/twolayer/se/SEReferenceImplementation.java b/library/test/org/webpki/sks/twolayer/se/SEReferenceImplementation.java
index 21355d39..14a8e67e 100644
--- a/library/test/org/webpki/sks/twolayer/se/SEReferenceImplementation.java
+++ b/library/test/org/webpki/sks/twolayer/se/SEReferenceImplementation.java
@@ -301,11 +301,11 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                      "AES/CBC/PKCS5Padding",
                      ALG_SYM_ENC | ALG_IV_INT | ALG_IV_REQ | ALG_SYML_256);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#aes.ecb.nopad",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#aes.ecb.nopad",
                      "AES/ECB/NoPadding",
                      ALG_SYM_ENC | ALG_SYML_128 | ALG_SYML_192 | ALG_SYML_256 | ALG_AES_PAD);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#aes.cbc",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#aes.cbc",
                      "AES/CBC/PKCS5Padding",
                      ALG_SYM_ENC | ALG_IV_REQ | ALG_SYML_128 | ALG_SYML_192 | ALG_SYML_256);
 
@@ -323,22 +323,22 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
         //////////////////////////////////////////////////////////////////////////////////////
         //  Asymmetric Key Decryption
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.es.pkcs1_5",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.es.pkcs1_5",
                      "RSA/ECB/PKCS1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha1",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.oaep.sha1",
                      "RSA/ECB/OAEPWithSHA-1AndMGF1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.oaep.sha256",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.oaep.sha256",
                      "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
                      ALG_ASYM_ENC | ALG_RSA_KEY | ALG_HASH_256);
 
         //////////////////////////////////////////////////////////////////////////////////////
         //  Diffie-Hellman Key Agreement
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ecdh.raw",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ecdh.raw",
                      "ECDH",
                      ALG_ASYM_KA | ALG_EC_KEY);
         
@@ -375,18 +375,18 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                      "NONEwithECDSA",
                      ALG_ASYM_SGN | ALG_EC_KEY | ALG_HASH_512);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa.pkcs1.none",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#rsa.pkcs1.none",
                      "NONEwithRSA",
                      ALG_ASYM_SGN | ALG_RSA_KEY);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ecdsa.none",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ecdsa.none",
                      "NONEwithECDSA",
                      ALG_ASYM_SGN | ALG_EC_KEY);
 
         //////////////////////////////////////////////////////////////////////////////////////
         //  Asymmetric Key Generation
         //////////////////////////////////////////////////////////////////////////////////////
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p256",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p256",
                      "secp256r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (32, new byte[]
               {(byte)0x30, (byte)0x59, (byte)0x30, (byte)0x13, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -402,7 +402,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0xCA, (byte)0x5F, (byte)0xB5, (byte)0x09, (byte)0x6E, (byte)0x95, (byte)0xCF, (byte)0x78,
                (byte)0x7C, (byte)0x0D, (byte)0xB2});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p384",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p384",
                      "secp384r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (48, new byte[]
               {(byte)0x30, (byte)0x76, (byte)0x30, (byte)0x10, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -421,7 +421,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x82, (byte)0xBD, (byte)0x65, (byte)0x83, (byte)0xB6, (byte)0x84, (byte)0x77, (byte)0xE8,
                (byte)0x1F, (byte)0xB8, (byte)0xD7, (byte)0x3D, (byte)0x79, (byte)0x88, (byte)0x2E, (byte)0x98});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.nist.p521",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.nist.p521",
                      "secp521r1",
                       ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (66, new byte[]
               {(byte)0x30, (byte)0x81, (byte)0x9B, (byte)0x30, (byte)0x10, (byte)0x06, (byte)0x07, (byte)0x2A,
@@ -445,7 +445,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x22, (byte)0xA8, (byte)0x87, (byte)0x64, (byte)0xD0, (byte)0x36, (byte)0xAF, (byte)0xD3,
                (byte)0x69, (byte)0xAC, (byte)0xCA, (byte)0xCB, (byte)0x1A, (byte)0x96});
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#ec.brainpool.p256r1",
+        addAlgorithm("https://webpki.github.io/sks/algorithm#ec.brainpool.p256r1",
                      "brainpoolP256r1",
                      ALG_EC_KEY | ALG_KEY_GEN).addEcCurve (32, new byte[]
               {(byte)0x30, (byte)0x5A, (byte)0x30, (byte)0x14, (byte)0x06, (byte)0x07, (byte)0x2A, (byte)0x86,
@@ -462,10 +462,10 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
                (byte)0x17, (byte)0xF3, (byte)0x3A, (byte)0xB4});
 
         for (short rsa_size : SecureKeyStore.SKS_DEFAULT_RSA_SUPPORT) {
-            addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa" + rsa_size,
+            addAlgorithm("https://webpki.github.io/sks/algorithm#rsa" + rsa_size,
                     null, ALG_RSA_KEY | ALG_KEY_GEN | rsa_size);
             if (SKS_RSA_EXPONENT_SUPPORT) {
-                addAlgorithm("http://xmlns.webpki.org/sks/algorithm#rsa" + rsa_size + ".exp",
+                addAlgorithm("https://webpki.github.io/sks/algorithm#rsa" + rsa_size + ".exp",
                         null, ALG_KEY_PARM | ALG_RSA_KEY | ALG_KEY_GEN | rsa_size);
             }
         }
@@ -477,7 +477,7 @@ static Algorithm addAlgorithm(String uri, String jceName, int mask) {
 
         addAlgorithm(SecureKeyStore.ALGORITHM_KEY_ATTEST_1, null, 0);
 
-        addAlgorithm("http://xmlns.webpki.org/sks/algorithm#none", null, ALG_NONE);
+        addAlgorithm("https://webpki.github.io/sks/algorithm#none", null, ALG_NONE);
 
     }
 
@@ -632,13 +632,14 @@ byte[] writeKey(byte[] osInstanceKey) throws GeneralSecurityException {
 
         void readKey(byte[] osInstanceKey, byte[] sealedKey) throws GeneralSecurityException {
             try {
-                ByteReader byte_reader = new ByteReader(sealedKey);
-                wrappedKey = byte_reader.getArray();
-                isSymmetric = byte_reader.readBoolean();
-                isExportable = byte_reader.readBoolean();
-                sha256OfPublicKeyOrCertificate = byte_reader.readArray(32);
-                byte[] oldMac = byte_reader.readArray(32);
-                byte_reader.checkEOF();
+                ByteReader byteReader = new ByteReader(sealedKey);
+                wrappedKey = byteReader.getArray();
+                isSymmetric = byteReader.readBoolean();
+                isExportable = byteReader.readBoolean();
+                sha256OfPublicKeyOrCertificate = byteReader.readArray(32);
+                byte[] oldMac = byteReader.readArray(32);
+                byteReader.checkEOF();
+                byteReader.close();
                 if (!Arrays.equals(oldMac, createMAC(osInstanceKey))) {
                     throw new GeneralSecurityException("Sealed key MAC error");
                 }
@@ -659,11 +660,12 @@ static class UnwrappedSessionKey {
 
         public void readKey(byte[] provisioningState) throws GeneralSecurityException {
             try {
-                ByteReader byte_reader = new ByteReader(provisioningState);
-                wrappedSessionKey = byte_reader.readArray(SecureKeyStore.AES_CBC_PKCS5_PADDING + 32);
-                macSequenceCounter = byte_reader.readShort();
-                sessionKeyLimit = byte_reader.readShort();
-                byte_reader.checkEOF();
+                ByteReader byteReader = new ByteReader(provisioningState);
+                wrappedSessionKey = byteReader.readArray(SecureKeyStore.AES_CBC_PKCS5_PADDING + 32);
+                macSequenceCounter = byteReader.readShort();
+                sessionKeyLimit = byteReader.readShort();
+                byteReader.checkEOF();
+                byteReader.close();
             } catch (IOException e) {
                 throw new GeneralSecurityException(e);
             }
@@ -1231,19 +1233,6 @@ public static void checkKeyPair(byte[] osInstanceKey,
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //                                                                            //
-    //                           executeSessionSign                               //
-    //                                                                            //
-    ////////////////////////////////////////////////////////////////////////////////
-    public static byte[] executeSessionSign(byte[] osInstanceKey,
-                                            byte[] provisioningState,
-                                            byte[] data) throws SKSException {
-        return getMacBuilder(getUnwrappedSessionKey(osInstanceKey, provisioningState),
-                SecureKeyStore.KDF_EXTERNAL_SIGNATURE).addVerbatim(data).getResult();
-    }
-
-
     ////////////////////////////////////////////////////////////////////////////////
     //                                                                            //
     //                        executeAsymmetricDecrypt                            //
@@ -1664,7 +1653,8 @@ public static SEProvisioningData createProvisioningData(byte[] osInstanceKey,
                                                             PublicKey keyManagementKey, // May be null
                                                             int clientTime,
                                                             int sessionLifeTime,
-                                                            short sessionKeyLimit) throws SKSException {
+                                                            short sessionKeyLimit,
+                                                            byte[] serverCertificate) throws SKSException {
         ///////////////////////////////////////////////////////////////////////////////////
         // Check provisioning session algorithm compatibility
         ///////////////////////////////////////////////////////////////////////////////////
@@ -1761,6 +1751,7 @@ public static SEProvisioningData createProvisioningData(byte[] osInstanceKey,
                 ska.addInt(clientTime);
                 ska.addInt(sessionLifeTime);
                 ska.addShort(sessionKeyLimit);
+                ska.addArray(serverCertificate);
                 seProvisioningData.attestation = ska.getResult();
             } else {
                 ///////////////////////////////////////////////////////////////////////////////////
@@ -1779,6 +1770,7 @@ public static SEProvisioningData createProvisioningData(byte[] osInstanceKey,
                 pka.addInt(clientTime);
                 pka.addInt(sessionLifeTime);
                 pka.addShort(sessionKeyLimit);
+                pka.addArray(serverCertificate);
                 seProvisioningData.attestation = pka.getResult();
             }
 
diff --git a/library/test/org/webpki/sks/twolayer/tee/TEEReferenceImplementation.java b/library/test/org/webpki/sks/twolayer/tee/TEEReferenceImplementation.java
index 3d970f3b..0d9993a8 100644
--- a/library/test/org/webpki/sks/twolayer/tee/TEEReferenceImplementation.java
+++ b/library/test/org/webpki/sks/twolayer/tee/TEEReferenceImplementation.java
@@ -432,7 +432,6 @@ class Provisioning implements TEEError, Serializable {
         String clientSessionId;
         String serverSessionId;
         String issuerUri;
-        byte[] sessionKey;
         boolean open = true;
         PublicKey keyManagementKey;
         short macSequenceCounter;
@@ -1550,25 +1549,6 @@ public synchronized EnumeratedProvisioningSession enumerateProvisioningSessions(
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //                                                                            //
-    //                      signProvisioningSessionData                           //
-    //                                                                            //
-    ////////////////////////////////////////////////////////////////////////////////
-    @Override
-    public synchronized byte[] signProvisioningSessionData(int provisioningHandle, byte[] data) throws SKSException {
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Get provisioning session
-        ///////////////////////////////////////////////////////////////////////////////////
-        Provisioning provisioning = getOpenProvisioningSession(provisioningHandle);
-
-        ///////////////////////////////////////////////////////////////////////////////////
-        // Sign through the SE
-        ///////////////////////////////////////////////////////////////////////////////////
-        return SEReferenceImplementation.executeSessionSign(OS_INSTANCE_KEY, provisioning.provisioningState, data);
-    }
-
-
     ////////////////////////////////////////////////////////////////////////////////
     //                                                                            //
     //                              getKeyHandle                                  //
@@ -1880,7 +1860,8 @@ public synchronized ProvisioningSession createProvisioningSession(String session
                                                                       PublicKey keyManagementKey, // May be null
                                                                       int clientTime,
                                                                       int sessionLifeTime,
-                                                                      short sessionKeyLimit) throws SKSException {
+                                                                      short sessionKeyLimit,
+                                                                      byte[] serverCertificate) throws SKSException {
         ///////////////////////////////////////////////////////////////////////////////////
         // Limited input validation
         ///////////////////////////////////////////////////////////////////////////////////
@@ -1899,7 +1880,8 @@ public synchronized ProvisioningSession createProvisioningSession(String session
                                                              keyManagementKey,
                                                              clientTime,
                                                              sessionLifeTime,
-                                                             sessionKeyLimit);
+                                                             sessionKeyLimit,
+                                                             serverCertificate);
 
         ///////////////////////////////////////////////////////////////////////////////////
         // We did it!
diff --git a/library/test/org/webpki/sks/ws/WSDeviceInfo.java b/library/test/org/webpki/sks/ws/WSDeviceInfo.java
index cdf18a16..0c46be8e 100644
--- a/library/test/org/webpki/sks/ws/WSDeviceInfo.java
+++ b/library/test/org/webpki/sks/ws/WSDeviceInfo.java
@@ -19,7 +19,6 @@
 import java.security.cert.X509Certificate;
 
 import org.webpki.sks.DeviceInfo;
-import org.webpki.sks.SKSException;
 
 public class WSDeviceInfo extends DeviceInfo {
     /**
diff --git a/library/test/org/webpki/sks/ws/client/SKSExceptionBean.java b/library/test/org/webpki/sks/ws/client/SKSExceptionBean.java
index 689bedd6..b4eeb7b7 100644
--- a/library/test/org/webpki/sks/ws/client/SKSExceptionBean.java
+++ b/library/test/org/webpki/sks/ws/client/SKSExceptionBean.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2018 WebPKI.org (http://webpki.org).
+ *  Copyright 2006-2014 WebPKI.org (http://webpki.org).
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/library/test/org/webpki/sks/ws/client/SKSException_Exception.java b/library/test/org/webpki/sks/ws/client/SKSException_Exception.java
index 6239ef90..ac8300ef 100644
--- a/library/test/org/webpki/sks/ws/client/SKSException_Exception.java
+++ b/library/test/org/webpki/sks/ws/client/SKSException_Exception.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2018 WebPKI.org (http://webpki.org).
+ *  Copyright 2006-2014 WebPKI.org (http://webpki.org).
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 @SuppressWarnings("serial")
 @WebFault(name="SKSException",
-          targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+          targetNamespace="https://webpki.github.io/sks/v1.00")
 public class SKSException_Exception extends Exception
   {
     /**
diff --git a/library/test/org/webpki/sks/ws/client/SKSWS.java b/library/test/org/webpki/sks/ws/client/SKSWS.java
index d2ed3c89..6d9fd29c 100644
--- a/library/test/org/webpki/sks/ws/client/SKSWS.java
+++ b/library/test/org/webpki/sks/ws/client/SKSWS.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2018 WebPKI.org (http://webpki.org).
+ *  Copyright 2006-2014 WebPKI.org (http://webpki.org).
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,19 +27,19 @@
 import javax.xml.ws.WebServiceClient;
 
 @WebServiceClient(name="SKSWS",
-                  targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                  targetNamespace="https://webpki.github.io/sks/v1.00")
 public class SKSWS extends Service
   {
     public SKSWS ()
       {
         super (SKSWS.class.getResource ("/META-INF/SKSWS.wsdl"),
-               new QName ("http://xmlns.webpki.org/sks/v1.00", "SKSWS"));
+               new QName ("https://webpki.github.io/sks/v1.00", "SKSWS"));
       }
 
     @WebEndpoint(name="SKSWS.Port")
     public SKSWSProxy getSKSWSPort ()
       {
-        return super.getPort (new QName ("http://xmlns.webpki.org/sks/v1.00", "SKSWS.Port"),
+        return super.getPort (new QName ("https://webpki.github.io/sks/v1.00", "SKSWS.Port"),
                               SKSWSProxy.class);
       }
   }
diff --git a/library/test/org/webpki/sks/ws/client/SKSWSClient.java b/library/test/org/webpki/sks/ws/client/SKSWSClient.java
index d870d9d2..4c18584f 100644
--- a/library/test/org/webpki/sks/ws/client/SKSWSClient.java
+++ b/library/test/org/webpki/sks/ws/client/SKSWSClient.java
@@ -217,7 +217,8 @@ public ProvisioningSession createProvisioningSession(String session_key_algorith
                                                          PublicKey keyManagementKey,
                                                          int clientTime,
                                                          int sessionLifeTime,
-                                                         short sessionKeyLimit) throws SKSException {
+                                                         short sessionKeyLimit,
+                                                         byte[] serverCertificate) throws SKSException {
         try {
             Holder<String> clientSessionId = new Holder<String>();
             Holder<byte[]> client_ephemeral_key = new Holder<byte[]>();
@@ -232,6 +233,7 @@ public ProvisioningSession createProvisioningSession(String session_key_algorith
                     clientTime,
                     sessionLifeTime,
                     sessionKeyLimit,
+                    serverCertificate,
                     clientSessionId,
                     client_ephemeral_key,
                     session_attestation);
@@ -310,18 +312,6 @@ public void abortProvisioningSession(int provisioning_handle) throws SKSExceptio
         }
     }
 
-    @Override
-    public byte[] signProvisioningSessionData(int provisioning_handle,
-                                              byte[] data) throws SKSException {
-        try {
-            return getSKSWS().signProvisioningSessionData(deviceId,
-                    provisioning_handle,
-                    data);
-        } catch (SKSException_Exception e) {
-            throw new SKSException(e.getFaultInfo().getMessage(), e.getFaultInfo().getError());
-        }
-    }
-
     @Override
     public int createPukPolicy(int provisioning_handle,
                                String id,
diff --git a/library/test/org/webpki/sks/ws/client/SKSWSProxy.java b/library/test/org/webpki/sks/ws/client/SKSWSProxy.java
index 3e0983ec..fe36decc 100644
--- a/library/test/org/webpki/sks/ws/client/SKSWSProxy.java
+++ b/library/test/org/webpki/sks/ws/client/SKSWSProxy.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2018 WebPKI.org (http://webpki.org).
+ *  Copyright 2006-2014 WebPKI.org (http://webpki.org).
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -35,678 +35,668 @@
  * This is the Java SKS WS client.
  */
 @WebService(serviceName="SKSWS",
-            targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+            targetNamespace="https://webpki.github.io/sks/v1.00")
 public interface SKSWSProxy
   {
     @WebMethod(operationName="getDeviceInfo")
-    @RequestWrapper(localName="getDeviceInfo", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getDeviceInfo.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="APILevel", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getDeviceInfo", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getDeviceInfo.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="APILevel", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Short> api_level,
-                               @WebParam(name="DeviceType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="DeviceType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Byte> device_type,
-                               @WebParam(name="UpdateURL", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="UpdateURL", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> update_url,
-                               @WebParam(name="VendorName", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="VendorName", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> vendor_name,
-                               @WebParam(name="VendorDescription", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="VendorDescription", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> vendor_description,
-                               @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                               Holder<List<byte[]>> certificatePath,
-                               @WebParam(name="SupportedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                               Holder<List<byte[]>> certificate_path,
+                               @WebParam(name="SupportedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<List<String>> supported_algorithms,
-                               @WebParam(name="CryptoDataSize", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="CryptoDataSize", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Integer> crypto_data_size,
-                               @WebParam(name="ExtensionDataSize", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="ExtensionDataSize", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Integer> extension_data_size,
-                               @WebParam(name="DevicePINSupport", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="DevicePINSupport", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Boolean> device_pin_support,
-                               @WebParam(name="BiometricSupport", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="BiometricSupport", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Boolean> biometric_support,
-                               @WebParam(name="ConnectionPort", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="ConnectionPort", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> connection_port)
     throws SKSException_Exception;
 
     @WebMethod(operationName="createProvisioningSession")
-    @RequestWrapper(localName="createProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String deviceId,
-                                          @WebParam(name="SessionKeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String device_id,
+                                          @WebParam(name="SessionKeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           String session_key_algorithm,
-                                          @WebParam(name="PrivacyEnabled", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="PrivacyEnabled", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           boolean privacy_enabled,
-                                          @WebParam(name="ServerSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String serverSessionId,
-                                          @WebParam(name="ServerEphemeralKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="ServerSessionID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String server_session_id,
+                                          @WebParam(name="ServerEphemeralKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           byte[] server_ephemeral_key,
-                                          @WebParam(name="IssuerURI", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="IssuerURI", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           String issuer_uri,
-                                          @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          byte[] keyManagementKey,
-                                          @WebParam(name="ClientTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          int clientTime,
-                                          @WebParam(name="SessionLifeTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          int sessionLifeTime,
-                                          @WebParam(name="SessionKeyLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          short sessionKeyLimit,
-                                          @WebParam(name="ClientSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                          Holder<String> clientSessionId,
-                                          @WebParam(name="ClientEphemeralKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          byte[] key_management_key,
+                                          @WebParam(name="ClientTime", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          int client_time,
+                                          @WebParam(name="SessionLifeTime", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          int session_life_time,
+                                          @WebParam(name="SessionKeyLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          short session_key_limit,
+                                          @WebParam(name="ServerCertificate", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          byte[] server_certificate,
+                                          @WebParam(name="ClientSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          Holder<String> client_session_id,
+                                          @WebParam(name="ClientEphemeralKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                           Holder<byte[]> client_ephemeral_key,
-                                          @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                           Holder<byte[]> attestation)
     throws SKSException_Exception;
 
     @WebMethod(operationName="closeProvisioningSession")
-    @RequestWrapper(localName="closeProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="closeProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="CloseAttestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] closeProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                            String deviceId,
-                                            @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="closeProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="closeProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="CloseAttestation", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] closeProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                            String device_id,
+                                            @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             int provisioning_handle,
-                                            @WebParam(name="Nonce", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                            @WebParam(name="Nonce", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             byte[] nonce,
-                                            @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                            @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="enumerateProvisioningSessions")
-    @RequestWrapper(localName="enumerateProvisioningSessions", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="enumerateProvisioningSessions.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                              String deviceId,
-                                              @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="enumerateProvisioningSessions", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="enumerateProvisioningSessions.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                              String device_id,
+                                              @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                               int provisioning_handle,
-                                              @WebParam(name="ProvisioningState", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                              @WebParam(name="ProvisioningState", targetNamespace="https://webpki.github.io/sks/v1.00")
                                               boolean provisioning_state,
-                                              @WebParam(name="SessionKeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="SessionKeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<String> session_key_algorithm,
-                                              @WebParam(name="PrivacyEnabled", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="PrivacyEnabled", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<Boolean> privacy_enabled,
-                                              @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<byte[]> keyManagementKey,
-                                              @WebParam(name="ClientTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<Integer> clientTime,
-                                              @WebParam(name="SessionLifeTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<Integer> sessionLifeTime,
-                                              @WebParam(name="ServerSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<String> serverSessionId,
-                                              @WebParam(name="ClientSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<String> clientSessionId,
-                                              @WebParam(name="IssuerURI", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<byte[]> key_management_key,
+                                              @WebParam(name="ClientTime", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<Integer> client_time,
+                                              @WebParam(name="SessionLifeTime", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<Integer> session_life_time,
+                                              @WebParam(name="ServerSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<String> server_session_id,
+                                              @WebParam(name="ClientSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<String> client_session_id,
+                                              @WebParam(name="IssuerURI", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<String> issuer_uri)
     throws SKSException_Exception;
 
     @WebMethod(operationName="abortProvisioningSession")
-    @RequestWrapper(localName="abortProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="abortProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void abortProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String deviceId,
-                                          @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="abortProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="abortProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void abortProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String device_id,
+                                          @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           int provisioning_handle)
     throws SKSException_Exception;
 
-    @WebMethod(operationName="signProvisioningSessionData")
-    @RequestWrapper(localName="signProvisioningSessionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="signProvisioningSessionData.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Signature", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] signProvisioningSessionData (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               String deviceId,
-                                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               int provisioning_handle,
-                                               @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               byte[] data)
-    throws SKSException_Exception;
-
     @WebMethod(operationName="createPukPolicy")
-    @RequestWrapper(localName="createPukPolicy", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createPukPolicy.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="PukPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createPukPolicy (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createPukPolicy", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createPukPolicy.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="PukPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createPukPolicy (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int provisioning_handle,
-                                @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String id,
-                                @WebParam(name="EncryptedPuk", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="EncryptedPuk", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] encrypted_puk,
-                                @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte format,
-                                @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short retryLimit,
-                                @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short retry_limit,
+                                @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="createPinPolicy")
-    @RequestWrapper(localName="createPinPolicy", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createPinPolicy.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="PINPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createPinPolicy (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createPinPolicy", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createPinPolicy.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="PINPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createPinPolicy (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int provisioning_handle,
-                                @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String id,
-                                @WebParam(name="PukPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="PukPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int puk_policy_handle,
-                                @WebParam(name="UserDefined", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                boolean userDefined,
-                                @WebParam(name="UserModifiable", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                boolean userModifiable,
-                                @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="UserDefined", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                boolean user_defined,
+                                @WebParam(name="UserModifiable", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                boolean user_modifiable,
+                                @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte format,
-                                @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short retryLimit,
-                                @WebParam(name="Grouping", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short retry_limit,
+                                @WebParam(name="Grouping", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte grouping,
-                                @WebParam(name="PatternRestrictions", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte patternRestrictions,
-                                @WebParam(name="MinLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short minLength,
-                                @WebParam(name="MaxLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short maxLength,
-                                @WebParam(name="InputMethod", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte inputMethod,
-                                @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="PatternRestrictions", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte pattern_restrictions,
+                                @WebParam(name="MinLength", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short min_length,
+                                @WebParam(name="MaxLength", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short max_length,
+                                @WebParam(name="InputMethod", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte input_method,
+                                @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="createKeyEntry")
-    @RequestWrapper(localName="createKeyEntry", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createKeyEntry.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createKeyEntry (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createKeyEntry", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createKeyEntry.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createKeyEntry (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String id,
-                               @WebParam(name="KeyEntryAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="KeyEntryAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String key_entry_algorithm,
-                               @WebParam(name="ServerSeed", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte[] serverSeed,
-                               @WebParam(name="DevicePinProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               boolean devicePinProtection,
-                               @WebParam(name="PinPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="ServerSeed", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte[] server_seed,
+                               @WebParam(name="DevicePinProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               boolean device_pin_protection,
+                               @WebParam(name="PinPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int pin_policy_handle,
-                               @WebParam(name="PinValue", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="PinValue", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] pin_value,
-                               @WebParam(name="EnablePinCaching", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               boolean enablePinCaching,
-                               @WebParam(name="BiometricProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte biometricProtection,
-                               @WebParam(name="ExportProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte exportProtection,
-                               @WebParam(name="DeleteProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte deleteProtection,
-                               @WebParam(name="AppUsage", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte appUsage,
-                               @WebParam(name="FriendlyName", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String friendlyName,
-                               @WebParam(name="KeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="EnablePinCaching", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               boolean enable_pin_caching,
+                               @WebParam(name="BiometricProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte biometric_protection,
+                               @WebParam(name="ExportProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte export_protection,
+                               @WebParam(name="DeleteProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte delete_protection,
+                               @WebParam(name="AppUsage", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte app_usage,
+                               @WebParam(name="FriendlyName", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String friendly_name,
+                               @WebParam(name="KeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String key_algorithm,
-                               @WebParam(name="KeyParameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte[] keyParameters,
-                               @WebParam(name="EndorsedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               List<String> endorsedAlgorithms,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="KeyParameters", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte[] key_parameters,
+                               @WebParam(name="EndorsedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               List<String> endorsed_algorithms,
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac,
-                               @WebParam(name="PublicKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                               Holder<byte[]> publicKey,
-                               @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="PublicKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                               Holder<byte[]> public_key,
+                               @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<byte[]> attestation)
     throws SKSException_Exception;
 
     @WebMethod(operationName="getKeyHandle")
-    @RequestWrapper(localName="getKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyHandle.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int getKeyHandle (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyHandle.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int getKeyHandle (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                              int provisioning_handle,
-                             @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String id)
     throws SKSException_Exception;
 
     @WebMethod(operationName="setCertificatePath")
-    @RequestWrapper(localName="setCertificatePath", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setCertificatePath.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setCertificatePath (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    String deviceId,
-                                    @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    int keyHandle,
-                                    @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    List<byte[]> certificatePath,
-                                    @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setCertificatePath", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setCertificatePath.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setCertificatePath (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    String device_id,
+                                    @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    int key_handle,
+                                    @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    List<byte[]> certificate_path,
+                                    @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="importSymmetricKey")
-    @RequestWrapper(localName="importSymmetricKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="importSymmetricKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void importSymmetricKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    String deviceId,
-                                    @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    int keyHandle,
-                                    @WebParam(name="EncryptedKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="importSymmetricKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="importSymmetricKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void importSymmetricKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    String device_id,
+                                    @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    int key_handle,
+                                    @WebParam(name="EncryptedKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] encrypted_key,
-                                    @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                    @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="importPrivateKey")
-    @RequestWrapper(localName="importPrivateKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="importPrivateKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void importPrivateKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="EncryptedKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="importPrivateKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="importPrivateKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void importPrivateKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="EncryptedKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] encrypted_key,
-                                  @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="addExtension")
-    @RequestWrapper(localName="addExtension", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="addExtension.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void addExtension (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="addExtension", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="addExtension.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void addExtension (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String type,
-                              @WebParam(name="SubType", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              byte subType,
-                              @WebParam(name="Qualifier", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="SubType", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              byte sub_type,
+                              @WebParam(name="Qualifier", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String qualifier,
-                              @WebParam(name="ExtensionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="ExtensionData", targetNamespace="https://webpki.github.io/sks/v1.00")
                               byte[] extension_data,
-                              @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                               byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="postDeleteKey")
-    @RequestWrapper(localName="postDeleteKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postDeleteKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postDeleteKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postDeleteKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postDeleteKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postDeleteKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="postUnlockKey")
-    @RequestWrapper(localName="postUnlockKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postUnlockKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postUnlockKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postUnlockKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postUnlockKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postUnlockKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="postUpdateKey")
-    @RequestWrapper(localName="postUpdateKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postUpdateKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postUpdateKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               int keyHandle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postUpdateKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postUpdateKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postUpdateKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               int key_handle,
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="postCloneKeyProtection")
-    @RequestWrapper(localName="postCloneKeyProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postCloneKeyProtection.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postCloneKeyProtection (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        int keyHandle,
-                                        @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postCloneKeyProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postCloneKeyProtection.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postCloneKeyProtection (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        int key_handle,
+                                        @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         int target_key_handle,
-                                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] authorization,
-                                        @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] mac)
     throws SKSException_Exception;
 
     @WebMethod(operationName="enumerateKeys")
-    @RequestWrapper(localName="enumerateKeys", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="enumerateKeys.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int enumerateKeys (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="enumerateKeys", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="enumerateKeys.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int enumerateKeys (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<Integer> provisioning_handle)
     throws SKSException_Exception;
 
     @WebMethod(operationName="updateKeyManagementKey")
-    @RequestWrapper(localName="updateKeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="updateKeyManagementKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void updateKeyManagementKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="updateKeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="updateKeyManagementKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void updateKeyManagementKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         int provisioning_handle,
-                                        @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        byte[] keyManagementKey,
-                                        @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        byte[] key_management_key,
+                                        @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] attestation)
     throws SKSException_Exception;
 
     @WebMethod(operationName="getKeyAttributes")
-    @RequestWrapper(localName="getKeyAttributes", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyAttributes.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getKeyAttributes (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="SymmetricKeyLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getKeyAttributes", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyAttributes.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getKeyAttributes (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="SymmetricKeyLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                   Holder<Short> symmetric_key_length,
-                                  @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<List<byte[]>> certificatePath,
-                                  @WebParam(name="AppUsage", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<Byte> appUsage,
-                                  @WebParam(name="FriendlyName", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<String> friendlyName,
-                                  @WebParam(name="EndorsedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<List<String>> endorsedAlgorithms,
-                                  @WebParam(name="ExtensionType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<List<byte[]>> certificate_path,
+                                  @WebParam(name="AppUsage", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<Byte> app_usage,
+                                  @WebParam(name="FriendlyName", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<String> friendly_name,
+                                  @WebParam(name="EndorsedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<List<String>> endorsed_algorithms,
+                                  @WebParam(name="ExtensionType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                   Holder<List<String>> extension_types)
     throws SKSException_Exception;
 
     @WebMethod(operationName="getKeyProtectionInfo")
-    @RequestWrapper(localName="getKeyProtectionInfo", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyProtectionInfo.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                      String deviceId,
-                                      @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                      int keyHandle,
-                                      @WebParam(name="ProtectionStatus", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> protectionStatus,
-                                      @WebParam(name="PukFormat", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getKeyProtectionInfo", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyProtectionInfo.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                      String device_id,
+                                      @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                      int key_handle,
+                                      @WebParam(name="ProtectionStatus", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> protection_status,
+                                      @WebParam(name="PukFormat", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> puk_format,
-                                      @WebParam(name="PukRetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PukRetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> puk_retry_limit,
-                                      @WebParam(name="PukErrorCount", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PukErrorCount", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> puk_error_count,
-                                      @WebParam(name="UserDefined", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> userDefined,
-                                      @WebParam(name="UserModifiable", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> userModifiable,
-                                      @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="UserDefined", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> user_defined,
+                                      @WebParam(name="UserModifiable", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> user_modifiable,
+                                      @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> format,
-                                      @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> retryLimit,
-                                      @WebParam(name="Grouping", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> retry_limit,
+                                      @WebParam(name="Grouping", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> grouping,
-                                      @WebParam(name="PatternRestrictions", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> patternRestrictions,
-                                      @WebParam(name="MinLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> minLength,
-                                      @WebParam(name="MaxLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> maxLength,
-                                      @WebParam(name="InputMethod", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> inputMethod,
-                                      @WebParam(name="PinErrorCount", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PatternRestrictions", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> pattern_restrictions,
+                                      @WebParam(name="MinLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> min_length,
+                                      @WebParam(name="MaxLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> max_length,
+                                      @WebParam(name="InputMethod", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> input_method,
+                                      @WebParam(name="PinErrorCount", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> pin_error_count,
-                                      @WebParam(name="EnablePinCaching", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> enablePinCaching,
-                                      @WebParam(name="BiometricProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> biometricProtection,
-                                      @WebParam(name="ExportProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> exportProtection,
-                                      @WebParam(name="DeleteProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> deleteProtection,
-                                      @WebParam(name="KeyBackup", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="EnablePinCaching", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> enable_pin_caching,
+                                      @WebParam(name="BiometricProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> biometric_protection,
+                                      @WebParam(name="ExportProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> export_protection,
+                                      @WebParam(name="DeleteProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> delete_protection,
+                                      @WebParam(name="KeyBackup", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> key_backup)
     throws SKSException_Exception;
 
     @WebMethod(operationName="getExtension")
-    @RequestWrapper(localName="getExtension", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getExtension.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getExtension (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getExtension", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getExtension.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getExtension (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String type,
-                              @WebParam(name="SubType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                              Holder<Byte> subType,
-                              @WebParam(name="Qualifier", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                              @WebParam(name="SubType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                              Holder<Byte> sub_type,
+                              @WebParam(name="Qualifier", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<String> qualifier,
-                              @WebParam(name="ExtensionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                              @WebParam(name="ExtensionData", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<byte[]> extension_data)
     throws SKSException_Exception;
 
     @WebMethod(operationName="setProperty")
-    @RequestWrapper(localName="setProperty", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setProperty.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setProperty (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             int keyHandle,
-                             @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setProperty", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setProperty.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setProperty (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             int key_handle,
+                             @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String type,
-                             @WebParam(name="Name", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="Name", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String name,
-                             @WebParam(name="Value", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="Value", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String value)
     throws SKSException_Exception;
 
     @WebMethod(operationName="deleteKey")
-    @RequestWrapper(localName="deleteKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="deleteKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void deleteKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="deleteKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="deleteKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void deleteKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization)
     throws SKSException_Exception;
 
     @WebMethod(operationName="exportKey")
-    @RequestWrapper(localName="exportKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="exportKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Key", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] exportKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             int keyHandle,
-                             @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="exportKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="exportKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Key", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] exportKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             int key_handle,
+                             @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                              byte[] authorization)
     throws SKSException_Exception;
 
     @WebMethod(operationName="unlockKey")
-    @RequestWrapper(localName="unlockKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="unlockKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void unlockKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="unlockKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="unlockKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void unlockKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization)
     throws SKSException_Exception;
 
     @WebMethod(operationName="changePin")
-    @RequestWrapper(localName="changePin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="changePin.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void changePin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="changePin", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="changePin.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void changePin (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization,
-                           @WebParam(name="NewPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                           @WebParam(name="NewPin", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] new_pin)
     throws SKSException_Exception;
 
     @WebMethod(operationName="setPin")
-    @RequestWrapper(localName="setPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setPin.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setPin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                        String deviceId,
-                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                        int keyHandle,
-                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setPin", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setPin.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setPin (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                        String device_id,
+                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                        int key_handle,
+                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                         byte[] authorization,
-                        @WebParam(name="NewPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                        @WebParam(name="NewPin", targetNamespace="https://webpki.github.io/sks/v1.00")
                         byte[] new_pin)
     throws SKSException_Exception;
 
     @WebMethod(operationName="signHashedData")
-    @RequestWrapper(localName="signHashedData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="signHashedData.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] signHashedData (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="signHashedData", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="signHashedData.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] signHashedData (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   String algorithm,
-                                  @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] parameters,
-                                  @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   boolean trusted_gui_authorization,
-                                  @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] authorization,
-                                  @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] data)
     throws SKSException_Exception;
 
     @WebMethod(operationName="asymmetricKeyDecrypt")
-    @RequestWrapper(localName="asymmetricKeyDecrypt", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="asymmetricKeyDecrypt.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] asymmetricKeyDecrypt (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        int keyHandle,
-                                        @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="asymmetricKeyDecrypt", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="asymmetricKeyDecrypt.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] asymmetricKeyDecrypt (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        int key_handle,
+                                        @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         String algorithm,
-                                        @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] parameters,
-                                        @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         boolean trusted_gui_authorization,
-                                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] authorization,
-                                        @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] data)
     throws SKSException_Exception;
 
     @WebMethod(operationName="keyAgreement")
-    @RequestWrapper(localName="keyAgreement", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="keyAgreement.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] keyAgreement (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                int keyHandle,
-                                @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="keyAgreement", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="keyAgreement.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] keyAgreement (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                int key_handle,
+                                @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String algorithm,
-                                @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] parameters,
-                                @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 boolean trusted_gui_authorization,
-                                @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] authorization,
-                                @WebParam(name="PublicKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte[] publicKey)
+                                @WebParam(name="PublicKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte[] public_key)
     throws SKSException_Exception;
 
     @WebMethod(operationName="performHmac")
-    @RequestWrapper(localName="performHmac", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="performHmac.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] performHmac (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               int keyHandle,
-                               @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="performHmac", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="performHmac.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] performHmac (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               int key_handle,
+                               @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String algorithm,
-                               @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] parameters,
-                               @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                boolean trusted_gui_authorization,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] data)
     throws SKSException_Exception;
 
     @WebMethod(operationName="symmetricKeyEncrypt")
-    @RequestWrapper(localName="symmetricKeyEncrypt", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="symmetricKeyEncrypt.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] symmetricKeyEncrypt (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                       String deviceId,
-                                       @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                       int keyHandle,
-                                       @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="symmetricKeyEncrypt", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="symmetricKeyEncrypt.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] symmetricKeyEncrypt (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                       String device_id,
+                                       @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                       int key_handle,
+                                       @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        String algorithm,
-                                       @WebParam(name="Mode", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Mode", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        boolean mode,
-                                       @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] parameters,
-                                       @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        boolean trusted_gui_authorization,
-                                       @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] authorization,
-                                       @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] data)
     throws SKSException_Exception;
 
     @WebMethod(operationName="updateFirmware")
-    @RequestWrapper(localName="updateFirmware", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="updateFirmware.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="NextURL", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public String updateFirmware (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="Chunk", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="updateFirmware", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="updateFirmware.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="NextURL", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public String updateFirmware (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="Chunk", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] chunk)
     throws SKSException_Exception;
 
     @WebMethod(operationName="listDevices")
-    @RequestWrapper(localName="listDevices", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="listDevices.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="listDevices", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="listDevices.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
     public List<String> listDevices ()
     throws SKSException_Exception;
 
     @WebMethod(operationName="getVersion")
-    @RequestWrapper(localName="getVersion", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getVersion.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Version", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getVersion", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getVersion.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Version", targetNamespace="https://webpki.github.io/sks/v1.00")
     public String getVersion ();
 
     @WebMethod(operationName="logEvent")
-    @RequestWrapper(localName="logEvent", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="logEvent.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void logEvent (@WebParam(name="Description", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="logEvent", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="logEvent.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void logEvent (@WebParam(name="Description", targetNamespace="https://webpki.github.io/sks/v1.00")
                           String description);
   }
diff --git a/library/test/org/webpki/sks/ws/nclient/SKSWSNativeClient.java b/library/test/org/webpki/sks/ws/nclient/SKSWSNativeClient.java
index 38bd544b..fb1994d9 100644
--- a/library/test/org/webpki/sks/ws/nclient/SKSWSNativeClient.java
+++ b/library/test/org/webpki/sks/ws/nclient/SKSWSNativeClient.java
@@ -46,7 +46,8 @@ native public ProvisioningSession createProvisioningSession(String algorithm,
                                                                 PublicKey keyManagementKey,
                                                                 int clientTime,
                                                                 int sessionLifeTime,
-                                                                short sessionKeyLimit) throws SKSException;
+                                                                short sessionKeyLimit,
+                                                                byte[] serverCertificate) throws SKSException;
 
     @Override
     native public byte[] closeProvisioningSession(int provisioning_handle,
@@ -57,10 +58,6 @@ native public byte[] closeProvisioningSession(int provisioning_handle,
     native public EnumeratedProvisioningSession enumerateProvisioningSessions(int provisioning_handle,
                                                                               boolean provisioning_state) throws SKSException;
 
-    @Override
-    native public byte[] signProvisioningSessionData(int provisioning_handle,
-                                                     byte[] data) throws SKSException;
-
     @Override
     native public KeyData createKeyEntry(int provisioning_handle,
                                          String id,
diff --git a/library/test/org/webpki/sks/ws/server/SKSWSImplementation.java b/library/test/org/webpki/sks/ws/server/SKSWSImplementation.java
index 2a5e18b6..9082eb97 100644
--- a/library/test/org/webpki/sks/ws/server/SKSWSImplementation.java
+++ b/library/test/org/webpki/sks/ws/server/SKSWSImplementation.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2018 WebPKI.org (http://webpki.org).
+ *  Copyright 2006-2014 WebPKI.org (http://webpki.org).
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@
  * to any conformant SKS implementation.
  */ 
 @WebService(serviceName="SKSWS",
-            targetNamespace="http://xmlns.webpki.org/sks/v1.00",
+            targetNamespace="https://webpki.github.io/sks/v1.00",
             name="SKSWS.Interface",
             portName="SKSWS.Port",
             wsdlLocation="META-INF/SKSWS.wsdl")
@@ -120,14 +120,14 @@ public class SKSWSImplementation
                     default_device = sks;
                   }
                 DeviceInfo device_info = sks.getDeviceInfo ();
-                String deviceId = DebugFormatter.getHexString (MessageDigest.getInstance ("SHA1").digest (device_info.getCertificatePath ()[0].getEncoded ()));
-                devices.put (deviceId, sks);
+                String device_id = DebugFormatter.getHexString (MessageDigest.getInstance ("SHA1").digest (device_info.getCertificatePath ()[0].getEncoded ()));
+                devices.put (device_id, sks);
                 System.out.println ("Device: " + device_info.getVendorDescription ());
                 System.out.println ("Vendor: " + device_info.getVendorName ());
                 System.out.println ("API Version: " + device_info.getApiLevel () / 100 + "." + 
                                                      (device_info.getApiLevel () / 10) % 10 + 
                                                      (device_info.getApiLevel () % 10 == 0 ? "" : "" + device_info.getApiLevel () % 10));
-                System.out.println ("DeviceID: " + deviceId);
+                System.out.println ("DeviceID: " + device_id);
               }
             if (default_device == null)
               {
@@ -166,21 +166,21 @@ void log (String message)
           }
       }
       
-    void log (String deviceId, String message)
+    void log (String device_id, String message)
       {
-        log (deviceId == null ? message : deviceId + ":" + message);
+        log (device_id == null ? message : device_id + ":" + message);
       }
       
-    SecureKeyStore getDevice (String deviceId) throws SKSException
+    SecureKeyStore getDevice (String device_id) throws SKSException
       {
-        if (deviceId == null)
+        if (device_id == null)
           {
             return default_device;
           }
-        SecureKeyStore sks = devices.get (deviceId);
+        SecureKeyStore sks = devices.get (device_id);
         if (sks == null)
           {
-             throw new SKSException ("No such device: " + deviceId, SKSException.ERROR_NOT_AVAILABLE);
+             throw new SKSException ("No such device: " + device_id, SKSException.ERROR_NOT_AVAILABLE);
           }
         return sks;
       }
@@ -190,7 +190,7 @@ String getEndEntityName (X509Certificate[] path)
         return path[0].getIssuerX500Principal ().toString () + " / " + path[0].getSubjectX500Principal ().toString ();
       }
 
-    String getConnectionPort (String deviceId) throws SKSException
+    String getConnectionPort (String device_id) throws SKSException
       {
         return null;  // Not implemented
       }
@@ -222,32 +222,32 @@ PublicKey createPublicKeyFromBlob (byte[] blob) throws SKSException
 
     ECPublicKey getECPublicKey (byte[] blob) throws SKSException
       {
-        PublicKey publicKey = createPublicKeyFromBlob (blob);
-        if (publicKey instanceof ECPublicKey)
+        PublicKey public_key = createPublicKeyFromBlob (blob);
+        if (public_key instanceof ECPublicKey)
           {
-            return (ECPublicKey) publicKey;
+            return (ECPublicKey) public_key;
           }
         throw new SKSException ("Expected EC key");
       }
 
-    byte[] checkAuthorization (String deviceId,
+    byte[] checkAuthorization (String device_id,
                                boolean trusted_gui_authorization,
-                               int keyHandle,
+                               int key_handle,
                                byte[] authorization) throws SKSException
       {
-        log (deviceId, "Local:getKeyProtectionInfo (KeyHandle=" + keyHandle + ")");
-        KeyProtectionInfo kpi = getDevice (deviceId).getKeyProtectionInfo (keyHandle);
+        log (device_id, "Local:getKeyProtectionInfo (KeyHandle=" + key_handle + ")");
+        KeyProtectionInfo kpi = getDevice (device_id).getKeyProtectionInfo (key_handle);
         if (kpi.hasLocalPinProtection ())
           {
             if (kpi.getPinInputMethod () == InputMethod.TRUSTED_GUI && !trusted_gui_authorization)
               {
-                String error = "Missing required \"TrustedGUIAuthorization\" for key #" + keyHandle;
+                String error = "Missing required \"TrustedGUIAuthorization\" for key #" + key_handle;
                 log (error);
                 throw new SKSException (error);
               }
             if (trusted_gui_authorization)
               {
-                log ("Restore authorization for KeyHandle=" + keyHandle);
+                log ("Restore authorization for KeyHandle=" + key_handle);
                 authorization = tga.restoreTrustedAuthorization (authorization);
               }
           }
@@ -255,49 +255,49 @@ byte[] checkAuthorization (String deviceId,
       }
 
     @WebMethod(operationName="getDeviceInfo")
-    @RequestWrapper(localName="getDeviceInfo", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getDeviceInfo.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="APILevel", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getDeviceInfo", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getDeviceInfo.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="APILevel", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Short> api_level,
-                               @WebParam(name="DeviceType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="DeviceType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Byte> device_type,
-                               @WebParam(name="UpdateURL", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="UpdateURL", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> update_url,
-                               @WebParam(name="VendorName", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="VendorName", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> vendor_name,
-                               @WebParam(name="VendorDescription", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="VendorDescription", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> vendor_description,
-                               @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                               Holder<List<byte[]>> certificatePath,
-                               @WebParam(name="SupportedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                               Holder<List<byte[]>> certificate_path,
+                               @WebParam(name="SupportedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<List<String>> supported_algorithms,
-                               @WebParam(name="CryptoDataSize", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="CryptoDataSize", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Integer> crypto_data_size,
-                               @WebParam(name="ExtensionDataSize", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="ExtensionDataSize", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Integer> extension_data_size,
-                               @WebParam(name="DevicePINSupport", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="DevicePINSupport", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Boolean> device_pin_support,
-                               @WebParam(name="BiometricSupport", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="BiometricSupport", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<Boolean> biometric_support,
-                               @WebParam(name="ConnectionPort", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="ConnectionPort", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<String> connection_port)
     throws SKSException
       {
-        log (deviceId, "getDeviceInfo ()");
+        log (device_id, "getDeviceInfo ()");
         try
           {
-            DeviceInfo device_info = getDevice (deviceId).getDeviceInfo ();
+            DeviceInfo device_info = getDevice (device_id).getDeviceInfo ();
             api_level.value = device_info.getApiLevel ();
             device_type.value= device_info.getDeviceType ();
             update_url.value = device_info.getUpdateUrl ();
             vendor_name.value = device_info.getVendorName ();
             vendor_description.value = device_info.getVendorDescription ();
-            certificatePath.value = new ArrayList<byte[]> ();
+            certificate_path.value = new ArrayList<byte[]> ();
             for (X509Certificate cert : device_info.getCertificatePath ())
               {
-                certificatePath.value.add (cert.getEncoded ());
+                certificate_path.value.add (cert.getEncoded ());
               }
             supported_algorithms.value = new ArrayList<String> ();
             for (String alg : device_info.getSupportedAlgorithms ())
@@ -308,7 +308,7 @@ public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="http://xm
             extension_data_size.value = device_info.getExtensionDataSize ();
             device_pin_support.value = device_info.getDevicePinSupport ();
             biometric_support.value = device_info.getBiometricSupport ();
-            connection_port.value = getConnectionPort (deviceId);
+            connection_port.value = getConnectionPort (device_id);
           }
         catch (GeneralSecurityException e)
           {
@@ -317,50 +317,53 @@ public void getDeviceInfo (@WebParam(name="DeviceID", targetNamespace="http://xm
       }
 
     @WebMethod(operationName="createProvisioningSession")
-    @RequestWrapper(localName="createProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String deviceId,
-                                          @WebParam(name="SessionKeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String device_id,
+                                          @WebParam(name="SessionKeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           String session_key_algorithm,
-                                          @WebParam(name="PrivacyEnabled", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="PrivacyEnabled", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           boolean privacy_enabled,
-                                          @WebParam(name="ServerSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String serverSessionId,
-                                          @WebParam(name="ServerEphemeralKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="ServerSessionID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String server_session_id,
+                                          @WebParam(name="ServerEphemeralKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           byte[] server_ephemeral_key,
-                                          @WebParam(name="IssuerURI", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                          @WebParam(name="IssuerURI", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           String issuer_uri,
-                                          @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          byte[] keyManagementKey,
-                                          @WebParam(name="ClientTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          int clientTime,
-                                          @WebParam(name="SessionLifeTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          int sessionLifeTime,
-                                          @WebParam(name="SessionKeyLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          short sessionKeyLimit,
-                                          @WebParam(name="ClientSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                          Holder<String> clientSessionId,
-                                          @WebParam(name="ClientEphemeralKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          byte[] key_management_key,
+                                          @WebParam(name="ClientTime", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          int client_time,
+                                          @WebParam(name="SessionLifeTime", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          int session_life_time,
+                                          @WebParam(name="SessionKeyLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          short session_key_limit,
+                                          @WebParam(name="ServerCertificate", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          byte[] server_certificate,
+                                          @WebParam(name="ClientSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          Holder<String> client_session_id,
+                                          @WebParam(name="ClientEphemeralKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                           Holder<byte[]> client_ephemeral_key,
-                                          @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                          @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                           Holder<byte[]> attestation)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            ProvisioningSession sess = getDevice (deviceId).createProvisioningSession (session_key_algorithm,
+            ProvisioningSession sess = getDevice (device_id).createProvisioningSession (session_key_algorithm,
                                                                                         privacy_enabled,
-                                                                                        serverSessionId,
+                                                                                        server_session_id,
                                                                                         getECPublicKey (server_ephemeral_key),
                                                                                         issuer_uri,
-                                                                                        keyManagementKey == null ? null : createPublicKeyFromBlob (keyManagementKey),
-                                                                                        clientTime,
-                                                                                        sessionLifeTime,
-                                                                                        sessionKeyLimit);
-            clientSessionId.value = sess.getClientSessionId ();
+                                                                                        key_management_key == null ? null : createPublicKeyFromBlob (key_management_key),
+                                                                                        client_time,
+                                                                                        session_life_time,
+                                                                                        session_key_limit,
+                                                                                        server_certificate);
+            client_session_id.value = sess.getClientSessionId ();
             client_ephemeral_key.value = sess.getClientEphemeralKey ().getEncoded ();
             attestation.value = sess.getAttestation ();
             log_result = " : ProvisioningHandle=" + sess.getProvisioningHandle ();
@@ -373,28 +376,28 @@ public int createProvisioningSession (@WebParam(name="DeviceID", targetNamespace
           }
         finally
           {
-            log (deviceId, "createProvisioningSession (IssuerURI=" + issuer_uri + ")" + log_result);
+            log (device_id, "createProvisioningSession (IssuerURI=" + issuer_uri + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="closeProvisioningSession")
-    @RequestWrapper(localName="closeProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="closeProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="CloseAttestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] closeProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                            String deviceId,
-                                            @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="closeProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="closeProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="CloseAttestation", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] closeProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                            String device_id,
+                                            @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             int provisioning_handle,
-                                            @WebParam(name="Nonce", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                            @WebParam(name="Nonce", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             byte[] nonce,
-                                            @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                            @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                             byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            return getDevice (deviceId).closeProvisioningSession (provisioning_handle, nonce, mac);
+            return getDevice (device_id).closeProvisioningSession (provisioning_handle, nonce, mac);
           }
         catch (SKSException e)
           {
@@ -403,42 +406,42 @@ public byte[] closeProvisioningSession (@WebParam(name="DeviceID", targetNamespa
           }
         finally
           {
-            log (deviceId, "closeProvisioningSession (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
+            log (device_id, "closeProvisioningSession (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="enumerateProvisioningSessions")
-    @RequestWrapper(localName="enumerateProvisioningSessions", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="enumerateProvisioningSessions.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                              String deviceId,
-                                              @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="enumerateProvisioningSessions", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="enumerateProvisioningSessions.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                              String device_id,
+                                              @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                               int provisioning_handle,
-                                              @WebParam(name="ProvisioningState", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                              @WebParam(name="ProvisioningState", targetNamespace="https://webpki.github.io/sks/v1.00")
                                               boolean provisioning_state,
-                                              @WebParam(name="SessionKeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="SessionKeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<String> session_key_algorithm,
-                                              @WebParam(name="PrivacyEnabled", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="PrivacyEnabled", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<Boolean> privacy_enabled,
-                                              @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<byte[]> keyManagementKey,
-                                              @WebParam(name="ClientTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<Integer> clientTime,
-                                              @WebParam(name="SessionLifeTime", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<Integer> sessionLifeTime,
-                                              @WebParam(name="ServerSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<String> serverSessionId,
-                                              @WebParam(name="ClientSessionID", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                              Holder<String> clientSessionId,
-                                              @WebParam(name="IssuerURI", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<byte[]> key_management_key,
+                                              @WebParam(name="ClientTime", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<Integer> client_time,
+                                              @WebParam(name="SessionLifeTime", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<Integer> session_life_time,
+                                              @WebParam(name="ServerSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<String> server_session_id,
+                                              @WebParam(name="ClientSessionID", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                              Holder<String> client_session_id,
+                                              @WebParam(name="IssuerURI", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                               Holder<String> issuer_uri)
     throws SKSException
       {
         String log_result = " : Empty";
         try
           {
-            EnumeratedProvisioningSession eps = getDevice (deviceId).enumerateProvisioningSessions (provisioning_handle, provisioning_state);
+            EnumeratedProvisioningSession eps = getDevice (device_id).enumerateProvisioningSessions (provisioning_handle, provisioning_state);
             if (eps == null)
               {
                 eps = new EnumeratedProvisioningSession ();  // Back to square #1
@@ -447,11 +450,11 @@ public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNames
               {
                 session_key_algorithm.value = eps.getSessionKeyAlgorithm ();
                 privacy_enabled.value = eps.getPrivacyEnabled ();
-                keyManagementKey.value = eps.getKeyManagementKey () == null ? null : eps.getKeyManagementKey ().getEncoded ();
-                clientTime.value = eps.getClientTime ();
-                sessionLifeTime.value = eps.getSessionLifeTime ();
-                serverSessionId.value = eps.getServerSessionId ();
-                clientSessionId.value = eps.getClientSessionId ();
+                key_management_key.value = eps.getKeyManagementKey () == null ? null : eps.getKeyManagementKey ().getEncoded ();
+                client_time.value = eps.getClientTime ();
+                session_life_time.value = eps.getSessionLifeTime ();
+                server_session_id.value = eps.getServerSessionId ();
+                client_session_id.value = eps.getClientSessionId ();
                 issuer_uri.value = eps.getIssuerUri ();
                 log_result = " : ProvisioningHandle=" + eps.getProvisioningHandle (); 
               }
@@ -464,23 +467,23 @@ public int enumerateProvisioningSessions (@WebParam(name="DeviceID", targetNames
           }
         finally
           {
-            log (deviceId, "enumerateProvisioningSessions (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
+            log (device_id, "enumerateProvisioningSessions (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="abortProvisioningSession")
-    @RequestWrapper(localName="abortProvisioningSession", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="abortProvisioningSession.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void abortProvisioningSession (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                          String deviceId,
-                                          @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="abortProvisioningSession", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="abortProvisioningSession.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void abortProvisioningSession (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                          String device_id,
+                                          @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                           int provisioning_handle)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).abortProvisioningSession (provisioning_handle);
+            getDevice (device_id).abortProvisioningSession (provisioning_handle);
           }
         catch (SKSException e)
           {
@@ -489,54 +492,38 @@ public void abortProvisioningSession (@WebParam(name="DeviceID", targetNamespace
           }
         finally
           {
-            log (deviceId, "abortProvisioningSession (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
+            log (device_id, "abortProvisioningSession (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
           }
       }
 
-    @WebMethod(operationName="signProvisioningSessionData")
-    @RequestWrapper(localName="signProvisioningSessionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="signProvisioningSessionData.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Signature", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] signProvisioningSessionData (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               String deviceId,
-                                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               int provisioning_handle,
-                                               @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                               byte[] data)
-    throws SKSException
-      {
-        log (deviceId, "signProvisioningSessionData (ProvisioningHandle=" + provisioning_handle + ")");
-        return getDevice (deviceId).signProvisioningSessionData (provisioning_handle, data);
-      }
-
     @WebMethod(operationName="createPukPolicy")
-    @RequestWrapper(localName="createPukPolicy", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createPukPolicy.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="PukPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createPukPolicy (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createPukPolicy", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createPukPolicy.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="PukPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createPukPolicy (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int provisioning_handle,
-                                @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String id,
-                                @WebParam(name="EncryptedPuk", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="EncryptedPuk", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] encrypted_puk,
-                                @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte format,
-                                @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short retryLimit,
-                                @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short retry_limit,
+                                @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] mac)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            int puk_policy_handle = getDevice (deviceId).createPukPolicy (provisioning_handle,
+            int puk_policy_handle = getDevice (device_id).createPukPolicy (provisioning_handle,
                                                                            id,
                                                                            encrypted_puk,
                                                                            format,
-                                                                           retryLimit,
+                                                                           retry_limit,
                                                                            mac);
             log_result = " : PukPolicyHandle=" + puk_policy_handle;
             return puk_policy_handle;
@@ -548,59 +535,59 @@ public int createPukPolicy (@WebParam(name="DeviceID", targetNamespace="http://x
           }
         finally
           {
-            log (deviceId, "createPukPolicy (ProvisioningHandle=" + provisioning_handle + ", ID=" + id + ")" + log_result);
+            log (device_id, "createPukPolicy (ProvisioningHandle=" + provisioning_handle + ", ID=" + id + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="createPinPolicy")
-    @RequestWrapper(localName="createPinPolicy", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createPinPolicy.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="PINPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createPinPolicy (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createPinPolicy", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createPinPolicy.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="PINPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createPinPolicy (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int provisioning_handle,
-                                @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String id,
-                                @WebParam(name="PukPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="PukPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 int puk_policy_handle,
-                                @WebParam(name="UserDefined", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                boolean userDefined,
-                                @WebParam(name="UserModifiable", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                boolean userModifiable,
-                                @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="UserDefined", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                boolean user_defined,
+                                @WebParam(name="UserModifiable", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                boolean user_modifiable,
+                                @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte format,
-                                @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short retryLimit,
-                                @WebParam(name="Grouping", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short retry_limit,
+                                @WebParam(name="Grouping", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte grouping,
-                                @WebParam(name="PatternRestrictions", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte patternRestrictions,
-                                @WebParam(name="MinLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short minLength,
-                                @WebParam(name="MaxLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                short maxLength,
-                                @WebParam(name="InputMethod", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte inputMethod,
-                                @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="PatternRestrictions", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte pattern_restrictions,
+                                @WebParam(name="MinLength", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short min_length,
+                                @WebParam(name="MaxLength", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                short max_length,
+                                @WebParam(name="InputMethod", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte input_method,
+                                @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] mac)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            int pin_policy_handle = getDevice (deviceId).createPinPolicy (provisioning_handle,
+            int pin_policy_handle = getDevice (device_id).createPinPolicy (provisioning_handle,
                                                                            id,
                                                                            puk_policy_handle,
-                                                                           userDefined,
-                                                                           userModifiable,
+                                                                           user_defined,
+                                                                           user_modifiable,
                                                                            format,
-                                                                           retryLimit,
+                                                                           retry_limit,
                                                                            grouping,
-                                                                           patternRestrictions,
-                                                                           minLength,
-                                                                           maxLength,
-                                                                           inputMethod,
+                                                                           pattern_restrictions,
+                                                                           min_length,
+                                                                           max_length,
+                                                                           input_method,
                                                                            mac);
             log_result = " : PinPolicyHandle=" + pin_policy_handle;
             return pin_policy_handle;
@@ -612,77 +599,77 @@ public int createPinPolicy (@WebParam(name="DeviceID", targetNamespace="http://x
           }
         finally
           {
-            log (deviceId, "createPinPolicy (ProvisioningHandle=" + provisioning_handle + ", PukPolicyHandle=" + puk_policy_handle + ", ID=" + id + ")" + log_result);
+            log (device_id, "createPinPolicy (ProvisioningHandle=" + provisioning_handle + ", PukPolicyHandle=" + puk_policy_handle + ", ID=" + id + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="createKeyEntry")
-    @RequestWrapper(localName="createKeyEntry", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="createKeyEntry.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int createKeyEntry (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="createKeyEntry", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="createKeyEntry.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int createKeyEntry (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String id,
-                               @WebParam(name="KeyEntryAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="KeyEntryAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String key_entry_algorithm,
-                               @WebParam(name="ServerSeed", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte[] serverSeed,
-                               @WebParam(name="DevicePinProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               boolean devicePinProtection,
-                               @WebParam(name="PinPolicyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="ServerSeed", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte[] server_seed,
+                               @WebParam(name="DevicePinProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               boolean device_pin_protection,
+                               @WebParam(name="PinPolicyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int pin_policy_handle,
-                               @WebParam(name="PinValue", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="PinValue", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] pin_value,
-                               @WebParam(name="EnablePinCaching", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               boolean enablePinCaching,
-                               @WebParam(name="BiometricProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte biometricProtection,
-                               @WebParam(name="ExportProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte exportProtection,
-                               @WebParam(name="DeleteProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte deleteProtection,
-                               @WebParam(name="AppUsage", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte appUsage,
-                               @WebParam(name="FriendlyName", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String friendlyName,
-                               @WebParam(name="KeyAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="EnablePinCaching", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               boolean enable_pin_caching,
+                               @WebParam(name="BiometricProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte biometric_protection,
+                               @WebParam(name="ExportProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte export_protection,
+                               @WebParam(name="DeleteProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte delete_protection,
+                               @WebParam(name="AppUsage", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte app_usage,
+                               @WebParam(name="FriendlyName", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String friendly_name,
+                               @WebParam(name="KeyAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String key_algorithm,
-                               @WebParam(name="KeyParameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               byte[] keyParameters,
-                               @WebParam(name="EndorsedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               List<String> endorsedAlgorithms,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="KeyParameters", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               byte[] key_parameters,
+                               @WebParam(name="EndorsedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               List<String> endorsed_algorithms,
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac,
-                               @WebParam(name="PublicKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                               Holder<byte[]> publicKey,
-                               @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                               @WebParam(name="PublicKey", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                               Holder<byte[]> public_key,
+                               @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                Holder<byte[]> attestation)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            KeyData kd = getDevice (deviceId).createKeyEntry (provisioning_handle,
+            KeyData kd = getDevice (device_id).createKeyEntry (provisioning_handle,
                                                                id,
                                                                key_entry_algorithm,
-                                                               serverSeed,
-                                                               devicePinProtection,
+                                                               server_seed,
+                                                               device_pin_protection,
                                                                pin_policy_handle,
                                                                pin_value,
-                                                               enablePinCaching,
-                                                               biometricProtection,
-                                                               exportProtection,
-                                                               deleteProtection,
-                                                               appUsage,
-                                                               friendlyName,
+                                                               enable_pin_caching,
+                                                               biometric_protection,
+                                                               export_protection,
+                                                               delete_protection,
+                                                               app_usage,
+                                                               friendly_name,
                                                                key_algorithm,
-                                                               keyParameters,
-                                                               endorsedAlgorithms.toArray (new String[0]),
+                                                               key_parameters,
+                                                               endorsed_algorithms.toArray (new String[0]),
                                                                mac);
-            publicKey.value = kd.getPublicKey ().getEncoded ();
+            public_key.value = kd.getPublicKey ().getEncoded ();
             attestation.value = kd.getAttestation ();
             log_result = " : KeyHandle=" + kd.getKeyHandle ();
             return kd.getKeyHandle ();
@@ -694,28 +681,28 @@ public int createKeyEntry (@WebParam(name="DeviceID", targetNamespace="http://xm
           }
         finally
           {
-            log (deviceId, "createKeyEntry (ProvisioningHandle=" + provisioning_handle + ", PinPolicyHandle=" + pin_policy_handle + ", ID=" + id + ")" + log_result);
+            log (device_id, "createKeyEntry (ProvisioningHandle=" + provisioning_handle + ", PinPolicyHandle=" + pin_policy_handle + ", ID=" + id + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="getKeyHandle")
-    @RequestWrapper(localName="getKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyHandle.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int getKeyHandle (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyHandle.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int getKeyHandle (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                              int provisioning_handle,
-                             @WebParam(name="ID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="ID", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String id)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            int keyHandle = getDevice (deviceId).getKeyHandle (provisioning_handle, id);
-            log_result = " : KeyHandle=" + keyHandle;
-            return keyHandle;
+            int key_handle = getDevice (device_id).getKeyHandle (provisioning_handle, id);
+            log_result = " : KeyHandle=" + key_handle;
+            return key_handle;
           }
         catch (SKSException e)
           {
@@ -724,28 +711,28 @@ public int getKeyHandle (@WebParam(name="DeviceID", targetNamespace="http://xmln
           }
         finally
           {
-            log (deviceId, "getKeyHandle (ProvisioningHandle=" + provisioning_handle + ", ID=" + id + ")" + log_result);
+            log (device_id, "getKeyHandle (ProvisioningHandle=" + provisioning_handle + ", ID=" + id + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="setCertificatePath")
-    @RequestWrapper(localName="setCertificatePath", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setCertificatePath.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setCertificatePath (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    String deviceId,
-                                    @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    int keyHandle,
-                                    @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    List<byte[]> certificatePath,
-                                    @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setCertificatePath", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setCertificatePath.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setCertificatePath (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    String device_id,
+                                    @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    int key_handle,
+                                    @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    List<byte[]> certificate_path,
+                                    @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] mac)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            X509Certificate[] cp = CertificateUtil.getSortedPathFromBlobs (certificatePath);
-            getDevice (deviceId).setCertificatePath (keyHandle, cp, mac);
+            X509Certificate[] cp = CertificateUtil.getSortedPathFromBlobs (certificate_path);
+            getDevice (device_id).setCertificatePath (key_handle, cp, mac);
             log_result = " : " + getEndEntityName (cp);
           }
         catch (SKSException e)
@@ -760,27 +747,27 @@ public void setCertificatePath (@WebParam(name="DeviceID", targetNamespace="http
           }
         finally
           {
-            log (deviceId, "setCertificatePath (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "setCertificatePath (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="importSymmetricKey")
-    @RequestWrapper(localName="importSymmetricKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="importSymmetricKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void importSymmetricKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    String deviceId,
-                                    @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                    int keyHandle,
-                                    @WebParam(name="EncryptedKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="importSymmetricKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="importSymmetricKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void importSymmetricKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    String device_id,
+                                    @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                    int key_handle,
+                                    @WebParam(name="EncryptedKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] encrypted_key,
-                                    @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                    @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                     byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).importSymmetricKey (keyHandle, encrypted_key, mac);
+            getDevice (device_id).importSymmetricKey (key_handle, encrypted_key, mac);
           }
         catch (SKSException e)
           {
@@ -789,27 +776,27 @@ public void importSymmetricKey (@WebParam(name="DeviceID", targetNamespace="http
           }
         finally
           {
-            log (deviceId, "importSymmetricKey (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "importSymmetricKey (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="importPrivateKey")
-    @RequestWrapper(localName="importPrivateKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="importPrivateKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void importPrivateKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="EncryptedKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="importPrivateKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="importPrivateKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void importPrivateKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="EncryptedKey", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] encrypted_key,
-                                  @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).importPrivateKey (keyHandle, encrypted_key, mac);
+            getDevice (device_id).importPrivateKey (key_handle, encrypted_key, mac);
           }
         catch (SKSException e)
           {
@@ -818,35 +805,35 @@ public void importPrivateKey (@WebParam(name="DeviceID", targetNamespace="http:/
           }
         finally
           {
-            log (deviceId, "importPrivateKey (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "importPrivateKey (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="addExtension")
-    @RequestWrapper(localName="addExtension", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="addExtension.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void addExtension (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="addExtension", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="addExtension.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void addExtension (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String type,
-                              @WebParam(name="SubType", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              byte subType,
-                              @WebParam(name="Qualifier", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="SubType", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              byte sub_type,
+                              @WebParam(name="Qualifier", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String qualifier,
-                              @WebParam(name="ExtensionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="ExtensionData", targetNamespace="https://webpki.github.io/sks/v1.00")
                               byte[] extension_data,
-                              @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                              @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                               byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).addExtension (keyHandle,
+            getDevice (device_id).addExtension (key_handle,
                                                 type,
-                                                subType,
+                                                sub_type,
                                                 qualifier,
                                                 extension_data,
                                                 mac);
@@ -858,29 +845,29 @@ public void addExtension (@WebParam(name="DeviceID", targetNamespace="http://xml
           }
         finally
           {
-            log (deviceId, "addExtension (KeyHandle=" + keyHandle + ", Type=" + type + ")" + log_result);
+            log (device_id, "addExtension (KeyHandle=" + key_handle + ", Type=" + type + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="postDeleteKey")
-    @RequestWrapper(localName="postDeleteKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postDeleteKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postDeleteKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postDeleteKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postDeleteKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postDeleteKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).postDeleteKey (provisioning_handle, target_key_handle, authorization, mac);
+            getDevice (device_id).postDeleteKey (provisioning_handle, target_key_handle, authorization, mac);
           }
         catch (SKSException e)
           {
@@ -889,29 +876,29 @@ public void postDeleteKey (@WebParam(name="DeviceID", targetNamespace="http://xm
           }
         finally
           {
-            log (deviceId, "postDeleteKey (ProvisioningHandle=" + provisioning_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
+            log (device_id, "postDeleteKey (ProvisioningHandle=" + provisioning_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="postUnlockKey")
-    @RequestWrapper(localName="postUnlockKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postUnlockKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postUnlockKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postUnlockKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postUnlockKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postUnlockKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int provisioning_handle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).postUnlockKey (provisioning_handle, target_key_handle, authorization, mac);
+            getDevice (device_id).postUnlockKey (provisioning_handle, target_key_handle, authorization, mac);
           }
         catch (SKSException e)
           {
@@ -920,29 +907,29 @@ public void postUnlockKey (@WebParam(name="DeviceID", targetNamespace="http://xm
           }
         finally
           {
-            log (deviceId, "postUnlockKey (ProvisioningHandle=" + provisioning_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
+            log (device_id, "postUnlockKey (ProvisioningHandle=" + provisioning_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="postUpdateKey")
-    @RequestWrapper(localName="postUpdateKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postUpdateKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postUpdateKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               int keyHandle,
-                               @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postUpdateKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postUpdateKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postUpdateKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               int key_handle,
+                               @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                int target_key_handle,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).postUpdateKey (keyHandle, target_key_handle, authorization, mac);
+            getDevice (device_id).postUpdateKey (key_handle, target_key_handle, authorization, mac);
           }
         catch (SKSException e)
           {
@@ -951,29 +938,29 @@ public void postUpdateKey (@WebParam(name="DeviceID", targetNamespace="http://xm
           }
         finally
           {
-            log (deviceId, "postUpdateKey (KeyHandle=" + keyHandle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
+            log (device_id, "postUpdateKey (KeyHandle=" + key_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="postCloneKeyProtection")
-    @RequestWrapper(localName="postCloneKeyProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="postCloneKeyProtection.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void postCloneKeyProtection (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        int keyHandle,
-                                        @WebParam(name="TargetKeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="postCloneKeyProtection", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="postCloneKeyProtection.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void postCloneKeyProtection (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        int key_handle,
+                                        @WebParam(name="TargetKeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         int target_key_handle,
-                                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] authorization,
-                                        @WebParam(name="MAC", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="MAC", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] mac)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).postCloneKeyProtection (keyHandle, target_key_handle, authorization, mac);
+            getDevice (device_id).postCloneKeyProtection (key_handle, target_key_handle, authorization, mac);
           }
         catch (SKSException e)
           {
@@ -982,26 +969,26 @@ public void postCloneKeyProtection (@WebParam(name="DeviceID", targetNamespace="
           }
         finally
           {
-            log (deviceId, "postCloneKeyProtection (KeyHandle=" + keyHandle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
+            log (device_id, "postCloneKeyProtection (KeyHandle=" + key_handle + ", TargetKeyHandle=" + target_key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="enumerateKeys")
-    @RequestWrapper(localName="enumerateKeys", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="enumerateKeys.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public int enumerateKeys (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="enumerateKeys", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="enumerateKeys.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public int enumerateKeys (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<Integer> provisioning_handle)
     throws SKSException
       {
         String log_result = " : Empty";
         try
           {
-            EnumeratedKey ek = getDevice (deviceId).enumerateKeys (keyHandle);
+            EnumeratedKey ek = getDevice (device_id).enumerateKeys (key_handle);
             if (ek == null)
               {
                 ek = new EnumeratedKey ();  // Back to square #1
@@ -1020,28 +1007,28 @@ public int enumerateKeys (@WebParam(name="DeviceID", targetNamespace="http://xml
           }
         finally
           {
-            log (deviceId, "enumerateKeys (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "enumerateKeys (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="updateKeyManagementKey")
-    @RequestWrapper(localName="updateKeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="updateKeyManagementKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void updateKeyManagementKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="ProvisioningHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="updateKeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="updateKeyManagementKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void updateKeyManagementKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="ProvisioningHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         int provisioning_handle,
-                                        @WebParam(name="KeyManagementKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        byte[] keyManagementKey,
-                                        @WebParam(name="Attestation", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="KeyManagementKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        byte[] key_management_key,
+                                        @WebParam(name="Attestation", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] attestation)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).updateKeyManagementKey (provisioning_handle,
-                                                          createPublicKeyFromBlob (keyManagementKey),
+            getDevice (device_id).updateKeyManagementKey (provisioning_handle,
+                                                          createPublicKeyFromBlob (key_management_key),
                                                           attestation);
           }
         catch (SKSException e)
@@ -1051,47 +1038,47 @@ public void updateKeyManagementKey (@WebParam(name="DeviceID", targetNamespace="
           }
         finally
           {
-            log (deviceId, "updateKeyManagementKey (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
+            log (device_id, "updateKeyManagementKey (ProvisioningHandle=" + provisioning_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="getKeyAttributes")
-    @RequestWrapper(localName="getKeyAttributes", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyAttributes.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getKeyAttributes (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="SymmetricKeyLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getKeyAttributes", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyAttributes.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getKeyAttributes (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="SymmetricKeyLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                   Holder<Short> symmetric_key_length,
-                                  @WebParam(name="X509Certificate", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<List<byte[]>> certificatePath,
-                                  @WebParam(name="AppUsage", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<Byte> appUsage,
-                                  @WebParam(name="FriendlyName", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<String> friendlyName,
-                                  @WebParam(name="EndorsedAlgorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                  Holder<List<String>> endorsedAlgorithms,
-                                  @WebParam(name="ExtensionType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  @WebParam(name="X509Certificate", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<List<byte[]>> certificate_path,
+                                  @WebParam(name="AppUsage", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<Byte> app_usage,
+                                  @WebParam(name="FriendlyName", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<String> friendly_name,
+                                  @WebParam(name="EndorsedAlgorithm", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                  Holder<List<String>> endorsed_algorithms,
+                                  @WebParam(name="ExtensionType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                   Holder<List<String>> extension_types)
     throws SKSException
       {
         String log_result = null;
         try
           {
-            KeyAttributes ka = getDevice (deviceId).getKeyAttributes (keyHandle);
+            KeyAttributes ka = getDevice (device_id).getKeyAttributes (key_handle);
             symmetric_key_length.value = ka.getSymmetricKeyLength ();
-            certificatePath.value = new ArrayList<byte[]> ();
+            certificate_path.value = new ArrayList<byte[]> ();
             for (X509Certificate cert : ka.getCertificatePath ())
               {
-                certificatePath.value.add (cert.getEncoded ());
+                certificate_path.value.add (cert.getEncoded ());
               }
-            appUsage.value = ka.getAppUsage ().getSksValue ();
-            friendlyName.value = ka.getFriendlyName ();
-            endorsedAlgorithms.value = new ArrayList<String> ();
+            app_usage.value = ka.getAppUsage ().getSksValue ();
+            friendly_name.value = ka.getFriendlyName ();
+            endorsed_algorithms.value = new ArrayList<String> ();
             for (String alg :   ka.getEndorsedAlgorithms ())
               {
-                endorsedAlgorithms.value.add (alg);
+                endorsed_algorithms.value.add (alg);
               }
             extension_types.value = new ArrayList<String> ();
             for (String type :  ka.getExtensionTypes ())
@@ -1112,62 +1099,62 @@ public void getKeyAttributes (@WebParam(name="DeviceID", targetNamespace="http:/
           }
         finally
           {
-            log (deviceId, "getKeyAttributes (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "getKeyAttributes (KeyHandle=" + key_handle + ")" + log_result);
           }
        }
 
     @WebMethod(operationName="getKeyProtectionInfo")
-    @RequestWrapper(localName="getKeyProtectionInfo", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getKeyProtectionInfo.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                      String deviceId,
-                                      @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                      int keyHandle,
-                                      @WebParam(name="ProtectionStatus", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> protectionStatus,
-                                      @WebParam(name="PukFormat", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+    @RequestWrapper(localName="getKeyProtectionInfo", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getKeyProtectionInfo.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                      String device_id,
+                                      @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                      int key_handle,
+                                      @WebParam(name="ProtectionStatus", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> protection_status,
+                                      @WebParam(name="PukFormat", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> puk_format,
-                                      @WebParam(name="PukRetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PukRetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> puk_retry_limit,
-                                      @WebParam(name="PukErrorCount", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PukErrorCount", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> puk_error_count,
-                                      @WebParam(name="UserDefined", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> userDefined,
-                                      @WebParam(name="UserModifiable", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> userModifiable,
-                                      @WebParam(name="Format", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="UserDefined", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> user_defined,
+                                      @WebParam(name="UserModifiable", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> user_modifiable,
+                                      @WebParam(name="Format", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> format,
-                                      @WebParam(name="RetryLimit", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> retryLimit,
-                                      @WebParam(name="Grouping", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="RetryLimit", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> retry_limit,
+                                      @WebParam(name="Grouping", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> grouping,
-                                      @WebParam(name="PatternRestrictions", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> patternRestrictions,
-                                      @WebParam(name="MinLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> minLength,
-                                      @WebParam(name="MaxLength", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Short> maxLength,
-                                      @WebParam(name="InputMethod", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> inputMethod,
-                                      @WebParam(name="PinErrorCount", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="PatternRestrictions", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> pattern_restrictions,
+                                      @WebParam(name="MinLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> min_length,
+                                      @WebParam(name="MaxLength", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Short> max_length,
+                                      @WebParam(name="InputMethod", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> input_method,
+                                      @WebParam(name="PinErrorCount", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Short> pin_error_count,
-                                      @WebParam(name="EnablePinCaching", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Boolean> enablePinCaching,
-                                      @WebParam(name="BiometricProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> biometricProtection,
-                                      @WebParam(name="ExportProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> exportProtection,
-                                      @WebParam(name="DeleteProtection", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                                      Holder<Byte> deleteProtection,
-                                      @WebParam(name="KeyBackup", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      @WebParam(name="EnablePinCaching", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Boolean> enable_pin_caching,
+                                      @WebParam(name="BiometricProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> biometric_protection,
+                                      @WebParam(name="ExportProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> export_protection,
+                                      @WebParam(name="DeleteProtection", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                                      Holder<Byte> delete_protection,
+                                      @WebParam(name="KeyBackup", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                                       Holder<Byte> key_backup)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            KeyProtectionInfo kpi      = getDevice (deviceId).getKeyProtectionInfo (keyHandle);
-            protectionStatus.value    = kpi.getSKSProtectionStatus ();
+            KeyProtectionInfo kpi      = getDevice (device_id).getKeyProtectionInfo (key_handle);
+            protection_status.value    = kpi.getSKSProtectionStatus ();
             if (kpi.hasLocalPukProtection ())
               {
                 puk_format.value           = kpi.getPukFormat ().getSksValue ();
@@ -1182,34 +1169,34 @@ public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="ht
               }
             if (kpi.hasLocalPinProtection ())
               {
-                userDefined.value         = kpi.getPinUserDefinedFlag ();
-                userModifiable.value      = kpi.getPinUserModifiableFlag ();
+                user_defined.value         = kpi.getPinUserDefinedFlag ();
+                user_modifiable.value      = kpi.getPinUserModifiableFlag ();
                 format.value               = kpi.getPinFormat ().getSksValue ();
-                retryLimit.value          = kpi.getPinRetryLimit ();
+                retry_limit.value          = kpi.getPinRetryLimit ();
                 grouping.value             = kpi.getPinGrouping ().getSksValue ();
-                patternRestrictions.value = PatternRestriction.getSksValue (kpi.getPatternRestrictions ());
-                minLength.value           = kpi.getPinMinLength ();
-                maxLength.value           = kpi.getPinMaxLength ();
-                inputMethod.value         = kpi.getPinInputMethod ().getSksValue ();
+                pattern_restrictions.value = PatternRestriction.getSksValue (kpi.getPatternRestrictions ());
+                min_length.value           = kpi.getPinMinLength ();
+                max_length.value           = kpi.getPinMaxLength ();
+                input_method.value         = kpi.getPinInputMethod ().getSksValue ();
                 pin_error_count.value      = kpi.getPinErrorCount ();
               }
             else
               {
-                userDefined.value         = false;
-                userModifiable.value      = false;
+                user_defined.value         = false;
+                user_modifiable.value      = false;
                 format.value               = (byte)0;
-                retryLimit.value          = (short)0;
+                retry_limit.value          = (short)0;
                 grouping.value             = (byte)0;
-                patternRestrictions.value = (byte)0;
-                minLength.value           = (short)0;
-                maxLength.value           = (short)0;
-                inputMethod.value         = (byte)0;
+                pattern_restrictions.value = (byte)0;
+                min_length.value           = (short)0;
+                max_length.value           = (short)0;
+                input_method.value         = (byte)0;
                 pin_error_count.value      = (short)0;
               }
-            enablePinCaching.value   = kpi.getEnablePinCachingFlag ();
-            biometricProtection.value = kpi.getBiometricProtection ().getSksValue ();
-            exportProtection.value    = kpi.getExportProtection ().getSksValue ();
-            deleteProtection.value    = kpi.getDeleteProtection ().getSksValue ();
+            enable_pin_caching.value   = kpi.getEnablePinCachingFlag ();
+            biometric_protection.value = kpi.getBiometricProtection ().getSksValue ();
+            export_protection.value    = kpi.getExportProtection ().getSksValue ();
+            delete_protection.value    = kpi.getDeleteProtection ().getSksValue ();
             key_backup.value           = kpi.getKeyBackup ();
           }
         catch (SKSException e)
@@ -1219,32 +1206,32 @@ public void getKeyProtectionInfo (@WebParam(name="DeviceID", targetNamespace="ht
           }
         finally
           {
-            log (deviceId, "getKeyProtectionInfo (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "getKeyProtectionInfo (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="getExtension")
-    @RequestWrapper(localName="getExtension", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getExtension.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void getExtension (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              String deviceId,
-                              @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                              int keyHandle,
-                              @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getExtension", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getExtension.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void getExtension (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              String device_id,
+                              @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                              int key_handle,
+                              @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                               String type,
-                              @WebParam(name="SubType", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
-                              Holder<Byte> subType,
-                              @WebParam(name="Qualifier", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                              @WebParam(name="SubType", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
+                              Holder<Byte> sub_type,
+                              @WebParam(name="Qualifier", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<String> qualifier,
-                              @WebParam(name="ExtensionData", targetNamespace="http://xmlns.webpki.org/sks/v1.00", mode=WebParam.Mode.OUT)
+                              @WebParam(name="ExtensionData", targetNamespace="https://webpki.github.io/sks/v1.00", mode=WebParam.Mode.OUT)
                               Holder<byte[]> extension_data)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            Extension ext = getDevice (deviceId).getExtension (keyHandle, type);
-            subType.value       = ext.getSubType ();
+            Extension ext = getDevice (device_id).getExtension (key_handle, type);
+            sub_type.value       = ext.getSubType ();
             qualifier.value      = ext.getQualifier ();
             extension_data.value = ext.getExtensionData ();
           }
@@ -1255,29 +1242,29 @@ public void getExtension (@WebParam(name="DeviceID", targetNamespace="http://xml
           }
         finally
           {
-            log (deviceId, "getExtension (KeyHandle=" + keyHandle + ", Type=" + type + ")" + log_result);
+            log (device_id, "getExtension (KeyHandle=" + key_handle + ", Type=" + type + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="setProperty")
-    @RequestWrapper(localName="setProperty", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setProperty.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setProperty (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             int keyHandle,
-                             @WebParam(name="Type", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setProperty", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setProperty.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setProperty (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             int key_handle,
+                             @WebParam(name="Type", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String type,
-                             @WebParam(name="Name", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="Name", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String name,
-                             @WebParam(name="Value", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                             @WebParam(name="Value", targetNamespace="https://webpki.github.io/sks/v1.00")
                              String value)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).setProperty (keyHandle, type, name, value);
+            getDevice (device_id).setProperty (key_handle, type, name, value);
           }
         catch (SKSException e)
           {
@@ -1286,25 +1273,25 @@ public void setProperty (@WebParam(name="DeviceID", targetNamespace="http://xmln
           }
         finally
           {
-            log (deviceId, "setProperty (KeyHandle=" + keyHandle + ", Type=" + type + ")" + log_result);
+            log (device_id, "setProperty (KeyHandle=" + key_handle + ", Type=" + type + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="deleteKey")
-    @RequestWrapper(localName="deleteKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="deleteKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void deleteKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="deleteKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="deleteKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void deleteKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).deleteKey (keyHandle, authorization);
+            getDevice (device_id).deleteKey (key_handle, authorization);
           }
         catch (SKSException e)
           {
@@ -1313,26 +1300,26 @@ public void deleteKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.
           }
         finally
           {
-            log (deviceId, "deleteKey (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "deleteKey (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="exportKey")
-    @RequestWrapper(localName="exportKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="exportKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Key", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] exportKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             String deviceId,
-                             @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                             int keyHandle,
-                             @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="exportKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="exportKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Key", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] exportKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             String device_id,
+                             @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                             int key_handle,
+                             @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                              byte[] authorization)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            return getDevice (deviceId).exportKey (keyHandle, authorization);
+            return getDevice (device_id).exportKey (key_handle, authorization);
           }
         catch (SKSException e)
           {
@@ -1341,25 +1328,25 @@ public byte[] exportKey (@WebParam(name="DeviceID", targetNamespace="http://xmln
           }
         finally
           {
-            log (deviceId, "exportKey (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "exportKey (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="unlockKey")
-    @RequestWrapper(localName="unlockKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="unlockKey.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void unlockKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="unlockKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="unlockKey.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void unlockKey (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).unlockKey (keyHandle, authorization);
+            getDevice (device_id).unlockKey (key_handle, authorization);
           }
         catch (SKSException e)
           {
@@ -1368,27 +1355,27 @@ public void unlockKey (@WebParam(name="DeviceID", targetNamespace="http://xmlns.
           }
         finally
           {
-            log (deviceId, "unlockKey (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "unlockKey (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="changePin")
-    @RequestWrapper(localName="changePin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="changePin.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void changePin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           String deviceId,
-                           @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                           int keyHandle,
-                           @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="changePin", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="changePin.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void changePin (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           String device_id,
+                           @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                           int key_handle,
+                           @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] authorization,
-                           @WebParam(name="NewPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                           @WebParam(name="NewPin", targetNamespace="https://webpki.github.io/sks/v1.00")
                            byte[] new_pin)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).changePin (keyHandle, authorization, new_pin);
+            getDevice (device_id).changePin (key_handle, authorization, new_pin);
           }
         catch (SKSException e)
           {
@@ -1397,27 +1384,27 @@ public void changePin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.
           }
         finally
           {
-            log (deviceId, "changePin (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "changePin (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="setPin")
-    @RequestWrapper(localName="setPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="setPin.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void setPin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                        String deviceId,
-                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                        int keyHandle,
-                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="setPin", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="setPin.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void setPin (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                        String device_id,
+                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                        int key_handle,
+                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                         byte[] authorization,
-                        @WebParam(name="NewPin", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                        @WebParam(name="NewPin", targetNamespace="https://webpki.github.io/sks/v1.00")
                         byte[] new_pin)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            getDevice (deviceId).setPin (keyHandle, authorization, new_pin);
+            getDevice (device_id).setPin (key_handle, authorization, new_pin);
           }
         catch (SKSException e)
           {
@@ -1426,38 +1413,38 @@ public void setPin (@WebParam(name="DeviceID", targetNamespace="http://xmlns.web
           }
         finally
           {
-            log (deviceId, "setPin (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "setPin (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="signHashedData")
-    @RequestWrapper(localName="signHashedData", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="signHashedData.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] signHashedData (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  int keyHandle,
-                                  @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="signHashedData", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="signHashedData.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] signHashedData (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  int key_handle,
+                                  @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   String algorithm,
-                                  @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] parameters,
-                                  @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   boolean trusted_gui_authorization,
-                                  @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] authorization,
-                                  @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                  @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] data)
     throws SKSException
       {
-        authorization = checkAuthorization (deviceId,
+        authorization = checkAuthorization (device_id,
                                             trusted_gui_authorization,
-                                            keyHandle,
+                                            key_handle,
                                             authorization);
         String log_result = "";
         try
           {
-            return getDevice (deviceId).signHashedData (keyHandle,
+            return getDevice (device_id).signHashedData (key_handle,
                                                          algorithm,
                                                          parameters,
                                                          authorization,
@@ -1470,38 +1457,38 @@ public byte[] signHashedData (@WebParam(name="DeviceID", targetNamespace="http:/
           }
         finally
           {
-            log (deviceId, "signHashedData (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "signHashedData (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="asymmetricKeyDecrypt")
-    @RequestWrapper(localName="asymmetricKeyDecrypt", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="asymmetricKeyDecrypt.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] asymmetricKeyDecrypt (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        String deviceId,
-                                        @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                        int keyHandle,
-                                        @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="asymmetricKeyDecrypt", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="asymmetricKeyDecrypt.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] asymmetricKeyDecrypt (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        String device_id,
+                                        @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                        int key_handle,
+                                        @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         String algorithm,
-                                        @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] parameters,
-                                        @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         boolean trusted_gui_authorization,
-                                        @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] authorization,
-                                        @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                        @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                         byte[] data)
     throws SKSException
       {
-        authorization = checkAuthorization (deviceId,
+        authorization = checkAuthorization (device_id,
                                             trusted_gui_authorization,
-                                            keyHandle,
+                                            key_handle,
                                             authorization);
         String log_result = "";
         try
           {
-            return getDevice (deviceId).asymmetricKeyDecrypt (keyHandle, 
+            return getDevice (device_id).asymmetricKeyDecrypt (key_handle, 
                                                                algorithm,
                                                                parameters,
                                                                authorization, 
@@ -1514,42 +1501,42 @@ public byte[] asymmetricKeyDecrypt (@WebParam(name="DeviceID", targetNamespace="
           }
         finally
           {
-            log (deviceId, "asymmetricKeyDecrypt (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "asymmetricKeyDecrypt (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="keyAgreement")
-    @RequestWrapper(localName="keyAgreement", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="keyAgreement.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] keyAgreement (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                String deviceId,
-                                @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                int keyHandle,
-                                @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="keyAgreement", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="keyAgreement.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] keyAgreement (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                String device_id,
+                                @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                int key_handle,
+                                @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 String algorithm,
-                                @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] parameters,
-                                @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 boolean trusted_gui_authorization,
-                                @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                 byte[] authorization,
-                                @WebParam(name="PublicKey", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                byte[] publicKey)
+                                @WebParam(name="PublicKey", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                byte[] public_key)
     throws SKSException
       {
-        authorization = checkAuthorization (deviceId,
+        authorization = checkAuthorization (device_id,
                                             trusted_gui_authorization,
-                                            keyHandle,
+                                            key_handle,
                                             authorization);
         String log_result = "";
         try
           {
-            return getDevice (deviceId).keyAgreement (keyHandle, 
+            return getDevice (device_id).keyAgreement (key_handle, 
                                                        algorithm, 
                                                        parameters, 
                                                        authorization, 
-                                                       getECPublicKey (publicKey));
+                                                       getECPublicKey (public_key));
           }
         catch (SKSException e)
           {
@@ -1558,38 +1545,38 @@ public byte[] keyAgreement (@WebParam(name="DeviceID", targetNamespace="http://x
           }
         finally
           {
-            log (deviceId, "keyAgreement (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "keyAgreement (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="performHmac")
-    @RequestWrapper(localName="performHmac", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="performHmac.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] performHmac (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               String deviceId,
-                               @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                               int keyHandle,
-                               @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="performHmac", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="performHmac.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] performHmac (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               String device_id,
+                               @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                               int key_handle,
+                               @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                String algorithm,
-                               @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] parameters,
-                               @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                boolean trusted_gui_authorization,
-                               @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] authorization,
-                               @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                               @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                byte[] data)
     throws SKSException
       {
-        authorization = checkAuthorization (deviceId,
+        authorization = checkAuthorization (device_id,
                                             trusted_gui_authorization,
-                                            keyHandle,
+                                            key_handle,
                                             authorization);
         String log_result = "";
         try
           {
-            return getDevice (deviceId).performHmac (keyHandle, 
+            return getDevice (device_id).performHmac (key_handle, 
                                                       algorithm,
                                                       parameters,
                                                       authorization,
@@ -1602,40 +1589,40 @@ public byte[] performHmac (@WebParam(name="DeviceID", targetNamespace="http://xm
           }
         finally
           {
-            log (deviceId, "performHMAC (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "performHMAC (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="symmetricKeyEncrypt")
-    @RequestWrapper(localName="symmetricKeyEncrypt", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="symmetricKeyEncrypt.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Result", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public byte[] symmetricKeyEncrypt (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                       String deviceId,
-                                       @WebParam(name="KeyHandle", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                       int keyHandle,
-                                       @WebParam(name="Algorithm", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="symmetricKeyEncrypt", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="symmetricKeyEncrypt.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Result", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public byte[] symmetricKeyEncrypt (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                       String device_id,
+                                       @WebParam(name="KeyHandle", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                       int key_handle,
+                                       @WebParam(name="Algorithm", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        String algorithm,
-                                       @WebParam(name="Mode", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Mode", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        boolean mode,
-                                       @WebParam(name="Parameters", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Parameters", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] parameters,
-                                       @WebParam(name="TrustedGUIAuthorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="TrustedGUIAuthorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        boolean trusted_gui_authorization,
-                                       @WebParam(name="Authorization", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Authorization", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] authorization,
-                                       @WebParam(name="Data", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+                                       @WebParam(name="Data", targetNamespace="https://webpki.github.io/sks/v1.00")
                                        byte[] data)
     throws SKSException
       {
-        authorization = checkAuthorization (deviceId,
+        authorization = checkAuthorization (device_id,
                                             trusted_gui_authorization,
-                                            keyHandle,
+                                            key_handle,
                                             authorization);
         String log_result = "";
         try
           {
-            return getDevice (deviceId).symmetricKeyEncrypt (keyHandle, 
+            return getDevice (device_id).symmetricKeyEncrypt (key_handle, 
                                                               algorithm,
                                                               mode,
                                                               parameters,
@@ -1649,24 +1636,24 @@ public byte[] symmetricKeyEncrypt (@WebParam(name="DeviceID", targetNamespace="h
           }
         finally
           {
-            log (deviceId, "symmetricKeyEncrypt (KeyHandle=" + keyHandle + ")" + log_result);
+            log (device_id, "symmetricKeyEncrypt (KeyHandle=" + key_handle + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="updateFirmware")
-    @RequestWrapper(localName="updateFirmware", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="updateFirmware.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="NextURL", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public String updateFirmware (@WebParam(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-                                  String deviceId,
-                                  @WebParam(name="Chunk", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="updateFirmware", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="updateFirmware.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="NextURL", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public String updateFirmware (@WebParam(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
+                                  String device_id,
+                                  @WebParam(name="Chunk", targetNamespace="https://webpki.github.io/sks/v1.00")
                                   byte[] chunk)
     throws SKSException
       {
         String log_result = "";
         try
           {
-            return getDevice (deviceId).updateFirmware (chunk);
+            return getDevice (device_id).updateFirmware (chunk);
           }
         catch (SKSException e)
           {
@@ -1675,14 +1662,14 @@ public String updateFirmware (@WebParam(name="DeviceID", targetNamespace="http:/
           }
         finally
           {
-            log (deviceId, "updateFirmware (Chunk.length=" + chunk.length + ")" + log_result);
+            log (device_id, "updateFirmware (Chunk.length=" + chunk.length + ")" + log_result);
           }
       }
 
     @WebMethod(operationName="listDevices")
-    @RequestWrapper(localName="listDevices", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="listDevices.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="DeviceID", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="listDevices", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="listDevices.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="DeviceID", targetNamespace="https://webpki.github.io/sks/v1.00")
     public List<String> listDevices ()
     throws SKSException
       {
@@ -1695,18 +1682,18 @@ public List<String> listDevices ()
       }
 
     @WebMethod(operationName="getVersion")
-    @RequestWrapper(localName="getVersion", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="getVersion.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @WebResult(name="Version", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="getVersion", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="getVersion.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @WebResult(name="Version", targetNamespace="https://webpki.github.io/sks/v1.00")
     public String getVersion ()
       {
         return "1.0";
       }
 
     @WebMethod(operationName="logEvent")
-    @RequestWrapper(localName="logEvent", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    @ResponseWrapper(localName="logEvent.Response", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
-    public void logEvent (@WebParam(name="Description", targetNamespace="http://xmlns.webpki.org/sks/v1.00")
+    @RequestWrapper(localName="logEvent", targetNamespace="https://webpki.github.io/sks/v1.00")
+    @ResponseWrapper(localName="logEvent.Response", targetNamespace="https://webpki.github.io/sks/v1.00")
+    public void logEvent (@WebParam(name="Description", targetNamespace="https://webpki.github.io/sks/v1.00")
                           String description)
       {
         log ("logEvent (Description=" + description + ")");
diff --git a/library/wsdl/SKSWS.wsdl b/library/wsdl/SKSWS.wsdl
index 6ac2e099..988e5a3a 100644
--- a/library/wsdl/SKSWS.wsdl
+++ b/library/wsdl/SKSWS.wsdl
@@ -21,15 +21,15 @@
         ///////////////////////////////////////////////
 
 -->
-<wsdl:definitions targetNamespace="http://xmlns.webpki.org/sks/v1.00"
+<wsdl:definitions targetNamespace="https://webpki.github.io/sks/v1.00"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:tns="http://xmlns.webpki.org/sks/v1.00"
+                  xmlns:tns="https://webpki.github.io/sks/v1.00"
                   xmlns:xs="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
 
   <wsdl:types>
 
-    <xs:schema targetNamespace="http://xmlns.webpki.org/sks/v1.00"
+    <xs:schema targetNamespace="https://webpki.github.io/sks/v1.00"
                elementFormDefault="qualified" attributeFormDefault="unqualified">
 
       <xs:element name="SKSException">
@@ -90,6 +90,7 @@
             <xs:element name="ClientTime" type="xs:int"/>
             <xs:element name="SessionLifeTime" type="xs:int"/>
             <xs:element name="SessionKeyLimit" type="xs:short"/>
+            <xs:element name="ServerCertificate" type="xs:base64Binary"/>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
@@ -172,28 +173,6 @@
       </xs:element>
       <xs:element name="abortProvisioningSession.Response"/>
 
-<!--
-      #########################################################
-      #              signProvisioningSessionData              #
-      #########################################################
--->
-      <xs:element name="signProvisioningSessionData">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="DeviceID" type="xs:string" nillable="true" minOccurs="0"/>
-            <xs:element name="ProvisioningHandle" type="xs:int"/>
-            <xs:element name="Data" type="xs:base64Binary"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="signProvisioningSessionData.Response">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="Signature" type="xs:base64Binary"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-
 <!--
       #########################################################
       #                    createPukPolicy                    #
@@ -933,14 +912,6 @@
     <wsdl:part name="parameters" element="tns:abortProvisioningSession.Response"/>
   </wsdl:message>
 
-  <wsdl:message name="signProvisioningSessionData">
-    <wsdl:part name="parameters" element="tns:signProvisioningSessionData"/>
-  </wsdl:message>
-
-  <wsdl:message name="signProvisioningSessionData.Response">
-    <wsdl:part name="parameters" element="tns:signProvisioningSessionData.Response"/>
-  </wsdl:message>
-
   <wsdl:message name="createPukPolicy">
     <wsdl:part name="parameters" element="tns:createPukPolicy"/>
   </wsdl:message>
@@ -1229,12 +1200,6 @@
       <wsdl:fault message="tns:SKSException" name="SKSException"/>
     </wsdl:operation>
 
-    <wsdl:operation name="signProvisioningSessionData">
-      <wsdl:input message="tns:signProvisioningSessionData"/>
-      <wsdl:output message="tns:signProvisioningSessionData.Response"/>
-      <wsdl:fault message="tns:SKSException" name="SKSException"/>
-    </wsdl:operation>
-
     <wsdl:operation name="createPukPolicy">
       <wsdl:input message="tns:createPukPolicy"/>
       <wsdl:output message="tns:createPukPolicy.Response"/>
@@ -1490,18 +1455,6 @@
         </wsdl:fault>
       </wsdl:operation>
 
-      <wsdl:operation name="signProvisioningSessionData">
-        <wsdl:input>
-          <soap:body use="literal"/>
-        </wsdl:input>
-        <wsdl:output>
-          <soap:body use="literal"/>
-        </wsdl:output>
-        <wsdl:fault name="SKSException">
-          <soap:fault name="SKSException" use="literal"/>
-        </wsdl:fault>
-      </wsdl:operation>
-
       <wsdl:operation name="createPukPolicy">
         <wsdl:input>
           <soap:body use="literal"/>