summaryrefslogtreecommitdiffstats
path: root/g10/pkglue.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2003-08-07 09:05:38 +0200
committerWerner Koch <wk@gnupg.org>2003-08-07 09:05:38 +0200
commitdbb7f4c89c774e160e981d6456b1c5bb868ffaef (patch)
treeace03e30f6531b8cdc075f1ba6a9a2f513509c8e /g10/pkglue.c
parentBumbed version number (diff)
downloadgnupg2-dbb7f4c89c774e160e981d6456b1c5bb868ffaef.tar.xz
gnupg2-dbb7f4c89c774e160e981d6456b1c5bb868ffaef.zip
(pk_sign): Fix last change.
(pk_verify): Check for valid DATA array so that we don't segv in Libgcrypt. (pk_verify): Ditto.
Diffstat (limited to 'g10/pkglue.c')
-rw-r--r--g10/pkglue.c46
1 files changed, 38 insertions, 8 deletions
diff --git a/g10/pkglue.c b/g10/pkglue.c
index 015aaf9ff..abec77d9d 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -48,6 +48,13 @@ 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)))",
skey[0], skey[1], skey[2], skey[3], skey[4]);
}
+ else if (algo == GCRY_PK_RSA)
+ {
+ rc = gcry_sexp_build (&s_skey, NULL,
+ "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",
+ skey[0], skey[1], skey[2], skey[3], skey[4],
+ skey[5]);
+ }
else if (algo == GCRY_PK_ELG || algo == GCRY_PK_ELG_E)
{
rc = gcry_sexp_build (&s_skey, NULL,
@@ -70,6 +77,14 @@ pk_sign (int algo, gcry_mpi_t * data, gcry_mpi_t hash, gcry_mpi_t * skey)
if (rc)
;
+ else if (algo == GCRY_PK_RSA)
+ {
+ list = gcry_sexp_find_token (s_sig, "s", 0);
+ assert (list);
+ data[0] = gcry_sexp_nth_mpi (list, 1, 0);
+ assert (data[0]);
+ gcry_sexp_release (list);
+ }
else
{
list = gcry_sexp_find_token (s_sig, "r", 0);
@@ -131,17 +146,26 @@ pk_verify (int algo, gcry_mpi_t hash, gcry_mpi_t * data, gcry_mpi_t * pkey)
/* put data into a S-Exp s_sig */
if (algo == GCRY_PK_DSA)
{
- rc = gcry_sexp_build (&s_sig, NULL,
- "(sig-val(dsa(r%m)(s%m)))", data[0], data[1]);
+ if (!data[0] || !data[1])
+ rc = gpg_error (GPG_ERR_BAD_MPI);
+ else
+ rc = gcry_sexp_build (&s_sig, NULL,
+ "(sig-val(dsa(r%m)(s%m)))", data[0], data[1]);
}
else if (algo == GCRY_PK_ELG || algo == GCRY_PK_ELG_E)
{
- rc = gcry_sexp_build (&s_sig, NULL,
- "(sig-val(elg(r%m)(s%m)))", data[0], data[1]);
+ if (!data[0] || !data[1])
+ rc = gpg_error (GPG_ERR_BAD_MPI);
+ else
+ rc = gcry_sexp_build (&s_sig, NULL,
+ "(sig-val(elg(r%m)(s%m)))", data[0], data[1]);
}
else if (algo == GCRY_PK_RSA)
{
- rc = gcry_sexp_build (&s_sig, NULL, "(sig-val(rsa(s%m)))", data[0]);
+ if (!data[0])
+ rc = gpg_error (GPG_ERR_BAD_MPI);
+ else
+ rc = gcry_sexp_build (&s_sig, NULL, "(sig-val(rsa(s%m)))", data[0]);
}
else
BUG ();
@@ -259,12 +283,18 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
/* put data into a S-Exp s_data */
if (algo == GCRY_PK_ELG || algo == GCRY_PK_ELG_E)
{
- rc = gcry_sexp_build (&s_data, NULL,
- "(enc-val(elg(a%m)(b%m)))", data[0], data[1]);
+ if (!data[0] || !data[1])
+ rc = gpg_error (GPG_ERR_BAD_MPI);
+ else
+ rc = gcry_sexp_build (&s_data, NULL,
+ "(enc-val(elg(a%m)(b%m)))", data[0], data[1]);
}
else if (algo == GCRY_PK_RSA)
{
- rc = gcry_sexp_build (&s_data, NULL, "(enc-val(rsa(a%m)))", data[0]);
+ if (!data[0])
+ rc = gpg_error (GPG_ERR_BAD_MPI);
+ else
+ rc = gcry_sexp_build (&s_data, NULL, "(enc-val(rsa(a%m)))", data[0]);
}
else
BUG ();