Re-unable RSA4096 processing, whereas the keys genration is still disabled. Usefull for people having old keys

src/gpg_gen.c

@@ -114,11 +114,9 @@ static int gpg_gen_rsa_kyey(gpg_key_t *keygpg, uint8_t *name) {
         case 3072 / 8:
             pkey_size = sizeof(cx_rsa_3072_private_key_t);
             break;
-#ifdef WITH_SUPPORT_RSA4096
         case 4096 / 8:
             pkey_size = sizeof(cx_rsa_4096_private_key_t);
             break;
-#endif
         default:
             break;
     }
@@ -195,14 +193,12 @@ static int gpg_read_rsa_kyey(gpg_key_t *keygpg) {
             }
             gpg_io_insert_tlv(0x81, ksz, (unsigned char *) &keygpg->priv_key.rsa3072.n);
             break;
-#ifdef WITH_SUPPORT_RSA4096
         case 4096 / 8:
             if (keygpg->priv_key.rsa4096.size == 0) {
                 return SW_REFERENCED_DATA_NOT_FOUND;
             }
             gpg_io_insert_tlv(0x81, ksz, (unsigned char *) &keygpg->priv_key.rsa4096.n);
             break;
-#endif
         default:
             return SW_REFERENCED_DATA_NOT_FOUND;
     }

src/gpg_pso.c

@@ -94,11 +94,9 @@ static int gpg_sign(gpg_key_t *sigkey) {
                 case 3072 / 8:
                     rsa_key = (cx_rsa_private_key_t *) &sigkey->priv_key.rsa3072;
                     break;
-#ifdef WITH_SUPPORT_RSA4096
                 case 4096 / 8:
                     rsa_key = (cx_rsa_private_key_t *) &sigkey->priv_key.rsa4096;
                     break;
-#endif
                 default:
                     break;
             }
@@ -286,12 +284,10 @@ int gpg_apdu_pso() {
                             rsa_key =
                                 (cx_rsa_private_key_t *) &G_gpg_vstate.mse_dec->priv_key.rsa3072;
                             break;
-#ifdef WITH_SUPPORT_RSA4096
                         case 4096 / 8:
                             rsa_key =
                                 (cx_rsa_private_key_t *) &G_gpg_vstate.mse_dec->priv_key.rsa4096;
                             break;
-#endif
                     }
 
                     if ((rsa_key == NULL) || (rsa_key->size != ksz)) {

src/gpg_types.h

@@ -90,9 +90,7 @@ typedef struct gpg_key_s {
         cx_rsa_private_key_t rsa;
         cx_rsa_2048_private_key_t rsa2048;
         cx_rsa_3072_private_key_t rsa3072;
-#ifdef WITH_SUPPORT_RSA4096
         cx_rsa_4096_private_key_t rsa4096;
-#endif
         cx_ecfp_private_key_t ecfp;
         cx_ecfp_256_private_key_t ecfp256;
         cx_ecfp_384_private_key_t ecfp384;
@@ -222,17 +220,13 @@ struct gpg_v_state_s {
                 cx_rsa_public_key_t public;
                 cx_rsa_2048_public_key_t public2048;
                 cx_rsa_3072_public_key_t public3072;
-#ifdef WITH_SUPPORT_RSA4096
                 cx_rsa_4096_public_key_t public4096;
-#endif
             };
             union {
                 cx_rsa_private_key_t private;
                 cx_rsa_2048_private_key_t private2048;
                 cx_rsa_3072_private_key_t private3072;
-#ifdef WITH_SUPPORT_RSA4096
                 cx_rsa_4096_private_key_t private4096;
-#endif
             };
         } rsa;