security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

Fix bug#1139.

Browse Source
This commit is contained in:
Werner Koch 2009-09-25 17:09:31 +00:00
parent 1b2e68abd7
commit 011a15ecf0
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-25 Werner Koch <wk@g10code.com>
* pkglue.c (pk_sign, pk_verify, pk_encrypt, pk_decrypt)
(pk_check_secret_key): Allow deprecated RSA identifiers 2 and 3.
Fixes bug#1139.
2009-09-04 Werner Koch <wk@g10code.com> 2009-09-04 Werner Koch <wk@g10code.com>
* keyedit.c (menu_select_uid): Use IDX ==-1 t select all. * keyedit.c (menu_select_uid): Use IDX ==-1 t select all.

19
g10/pkglue.c
View File

@ -61,7 +61,7 @@ pk_sign (int algo, gcry_mpi_t * data, gcry_mpi_t hash, gcry_mpi_t * skey)
"(private-key(dsa(p%m)(q%m)(g%m)(y%m)(x%m)))", "(private-key(dsa(p%m)(q%m)(g%m)(y%m)(x%m)))",
skey[0], skey[1], skey[2], skey[3], skey[4]); skey[0], skey[1], skey[2], skey[3], skey[4]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_S)
{ {
rc = gcry_sexp_build (&s_skey, NULL, rc = gcry_sexp_build (&s_skey, NULL,
"(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))", "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",
@ -90,7 +90,7 @@ pk_sign (int algo, gcry_mpi_t * data, gcry_mpi_t hash, gcry_mpi_t * skey)
if (rc) if (rc)
; ;
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_S)
data[0] = mpi_from_sexp (s_sig, "s"); data[0] = mpi_from_sexp (s_sig, "s");
else else
{ {
@ -125,7 +125,7 @@ pk_verify (int algo, gcry_mpi_t hash, gcry_mpi_t * data, gcry_mpi_t * pkey)
"(public-key(elg(p%m)(g%m)(y%m)))", "(public-key(elg(p%m)(g%m)(y%m)))",
pkey[0], pkey[1], pkey[2]); pkey[0], pkey[1], pkey[2]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_S)
{ {
rc = gcry_sexp_build (&s_pkey, NULL, rc = gcry_sexp_build (&s_pkey, NULL,
"(public-key(rsa(n%m)(e%m)))", pkey[0], pkey[1]); "(public-key(rsa(n%m)(e%m)))", pkey[0], pkey[1]);
@ -158,7 +158,7 @@ pk_verify (int algo, gcry_mpi_t hash, gcry_mpi_t * data, gcry_mpi_t * pkey)
rc = gcry_sexp_build (&s_sig, NULL, rc = gcry_sexp_build (&s_sig, NULL,
"(sig-val(elg(r%m)(s%m)))", data[0], data[1]); "(sig-val(elg(r%m)(s%m)))", data[0], data[1]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_S)
{ {
if (!data[0]) if (!data[0])
rc = gpg_error (GPG_ERR_BAD_MPI); rc = gpg_error (GPG_ERR_BAD_MPI);
@ -197,7 +197,7 @@ pk_encrypt (int algo, gcry_mpi_t * resarr, gcry_mpi_t data, gcry_mpi_t * pkey)
"(public-key(elg(p%m)(g%m)(y%m)))", "(public-key(elg(p%m)(g%m)(y%m)))",
pkey[0], pkey[1], pkey[2]); pkey[0], pkey[1], pkey[2]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_E)
{ {
rc = gcry_sexp_build (&s_pkey, NULL, rc = gcry_sexp_build (&s_pkey, NULL,
"(public-key(rsa(n%m)(e%m)))", "(public-key(rsa(n%m)(e%m)))",
@ -223,7 +223,7 @@ pk_encrypt (int algo, gcry_mpi_t * resarr, gcry_mpi_t data, gcry_mpi_t * pkey)
else else
{ /* add better error handling or make gnupg use S-Exp directly */ { /* add better error handling or make gnupg use S-Exp directly */
resarr[0] = mpi_from_sexp (s_ciph, "a"); resarr[0] = mpi_from_sexp (s_ciph, "a");
if (algo != GCRY_PK_RSA) if (algo != GCRY_PK_RSA && algo != GCRY_PK_RSA_E)
resarr[1] = mpi_from_sexp (s_ciph, "b"); resarr[1] = mpi_from_sexp (s_ciph, "b");
} }
@ -252,7 +252,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
"(private-key(elg(p%m)(g%m)(y%m)(x%m)))", "(private-key(elg(p%m)(g%m)(y%m)(x%m)))",
skey[0], skey[1], skey[2], skey[3]); skey[0], skey[1], skey[2], skey[3]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_E)
{ {
rc = gcry_sexp_build (&s_skey, NULL, rc = gcry_sexp_build (&s_skey, NULL,
"(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))", "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",
@ -274,7 +274,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
rc = gcry_sexp_build (&s_data, NULL, rc = gcry_sexp_build (&s_data, NULL,
"(enc-val(elg(a%m)(b%m)))", data[0], data[1]); "(enc-val(elg(a%m)(b%m)))", data[0], data[1]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA || algo == GCRY_PK_RSA_E)
{ {
if (!data[0]) if (!data[0])
rc = gpg_error (GPG_ERR_BAD_MPI); rc = gpg_error (GPG_ERR_BAD_MPI);
@ -321,7 +321,8 @@ pk_check_secret_key (int algo, gcry_mpi_t *skey)
"(private-key(elg(p%m)(g%m)(y%m)(x%m)))", "(private-key(elg(p%m)(g%m)(y%m)(x%m)))",
skey[0], skey[1], skey[2], skey[3]); skey[0], skey[1], skey[2], skey[3]);
} }
else if (algo == GCRY_PK_RSA) else if (algo == GCRY_PK_RSA
|| algo == GCRY_PK_RSA_S || algo == GCRY_PK_RSA_E)
{ {
rc = gcry_sexp_build (&s_skey, NULL, rc = gcry_sexp_build (&s_skey, NULL,
"(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))", "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",