Upgrade to version 2.2

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

build_pico_openpgp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_MAJOR="2"
-VERSION_MINOR="0"
+VERSION_MINOR="2"
 
 rm -rf release/*
 cd build_release

patch_vidpid.sh

@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION_MAJOR="4" #Version of Pico CCID Core
+VERSION_MAJOR="5" #Version of Pico Keys SDK
 VERSION_MINOR="0"
 
 echo "----------------------------"

src/openpgp/openpgp.c

@@ -473,7 +473,7 @@ int inc_sig_count() {
     if (!(pw_status = search_by_fid(EF_PW_PRIV, NULL, SPECIFY_EF)) || !pw_status->data) {
         return SW_REFERENCE_NOT_FOUND();
     }
-    if (file_get_data(pw_status)[0] == 1) {
+    if (file_get_data(pw_status)[0] == 0) {
         has_pw1 = false;
     }
     file_t *ef = search_by_fid(EF_SIG_COUNT, NULL, SPECIFY_ANY);
@@ -1177,10 +1177,10 @@ int store_keys(void *key_ctx, int type, uint16_t key_id, bool use_kek) {
     }
     else if (type == ALGO_ECDSA || type == ALGO_ECDH) {
         mbedtls_ecdsa_context *ecdsa = (mbedtls_ecdsa_context *) key_ctx;
-        key_size = mbedtls_mpi_size(&ecdsa->d);
+        size_t olen = 0;
         kdata[0] = ecdsa->grp.id & 0xff;
-        mbedtls_ecp_write_key(ecdsa, kdata + 1, key_size);
+        mbedtls_ecp_write_key_ext(ecdsa, &olen, kdata + 1, sizeof(kdata) - 1);
-        key_size++;
+        key_size = olen + 1;
     }
     else if (type & ALGO_AES) {
         if (type == ALGO_AES_128) {

src/openpgp/version.h

@@ -24,7 +24,7 @@
 #define OPGP_VERSION_MINOR (OPGP_VERSION & 0xff)
 
 
-#define PIPGP_VERSION 0x0200
+#define PIPGP_VERSION 0x0202
 
 #define PIPGP_VERSION_MAJOR ((PIPGP_VERSION >> 8) & 0xff)
 #define PIPGP_VERSION_MINOR (PIPGP_VERSION & 0xff)