2008-04-06 05:55:31 +02:00
|
|
|
# adds back support for deprecated RSA_E, RSA_S algorithms
|
2009-11-16 18:35:33 +01:00
|
|
|
Index: gnupg-2.0.13/g10/misc.c
|
2009-06-20 01:33:05 +02:00
|
|
|
===================================================================
|
2009-11-16 18:35:33 +01:00
|
|
|
--- gnupg-2.0.13.orig/g10/misc.c 2009-07-16 08:22:45.000000000 +0200
|
|
|
|
+++ gnupg-2.0.13/g10/misc.c 2009-11-13 13:19:39.000000000 +0100
|
2009-06-20 01:33:05 +02:00
|
|
|
@@ -1308,6 +1308,8 @@ pubkey_get_npkey( int algo )
|
2008-04-06 05:55:31 +02:00
|
|
|
|
|
|
|
if (algo == GCRY_PK_ELG_E)
|
|
|
|
algo = GCRY_PK_ELG;
|
|
|
|
+ if (algo == GCRY_PK_RSA_E || algo == GCRY_PK_RSA_S)
|
|
|
|
+ algo = GCRY_PK_RSA;
|
|
|
|
if (gcry_pk_algo_info( algo, GCRYCTL_GET_ALGO_NPKEY, NULL, &n))
|
|
|
|
n = 0;
|
|
|
|
return n;
|
2009-06-20 01:33:05 +02:00
|
|
|
@@ -1321,6 +1323,8 @@ pubkey_get_nskey( int algo )
|
2008-04-06 05:55:31 +02:00
|
|
|
|
|
|
|
if (algo == GCRY_PK_ELG_E)
|
|
|
|
algo = GCRY_PK_ELG;
|
|
|
|
+ if (algo == GCRY_PK_RSA_E || algo == GCRY_PK_RSA_S)
|
|
|
|
+ algo = GCRY_PK_RSA;
|
|
|
|
if (gcry_pk_algo_info( algo, GCRYCTL_GET_ALGO_NSKEY, NULL, &n ))
|
|
|
|
n = 0;
|
|
|
|
return n;
|
2009-06-20 01:33:05 +02:00
|
|
|
@@ -1334,6 +1338,8 @@ pubkey_get_nsig( int algo )
|
2008-04-06 05:55:31 +02:00
|
|
|
|
|
|
|
if (algo == GCRY_PK_ELG_E)
|
|
|
|
algo = GCRY_PK_ELG;
|
|
|
|
+ if (algo == GCRY_PK_RSA_E || algo == GCRY_PK_RSA_S)
|
|
|
|
+ algo = GCRY_PK_RSA;
|
|
|
|
if (gcry_pk_algo_info( algo, GCRYCTL_GET_ALGO_NSIGN, NULL, &n))
|
|
|
|
n = 0;
|
|
|
|
return n;
|
2009-06-20 01:33:05 +02:00
|
|
|
@@ -1347,6 +1353,8 @@ pubkey_get_nenc( int algo )
|
2008-04-06 05:55:31 +02:00
|
|
|
|
|
|
|
if (algo == GCRY_PK_ELG_E)
|
|
|
|
algo = GCRY_PK_ELG;
|
|
|
|
+ if (algo == GCRY_PK_RSA_E || algo == GCRY_PK_RSA_S)
|
|
|
|
+ algo = GCRY_PK_RSA;
|
|
|
|
if (gcry_pk_algo_info( algo, GCRYCTL_GET_ALGO_NENCR, NULL, &n ))
|
|
|
|
n = 0;
|
|
|
|
return n;
|