denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

used rsa coeff field in OpenPGP secret key payload

Browse Source
This commit is contained in:
Andreas Steffen
2009-06-09 11:03:33 +02:00
committed by Martin Willi
parent 1bb4d7dd79
commit b6f19a6ab4
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
+32 -25
View File
@@ -827,30 +827,40 @@ static gmp_rsa_private_key_t *load_pgp(chunk_t blob)
mpz_init(this->exp2); mpz_init(this->exp2);
mpz_init(this->coeff); mpz_init(this->coeff);
for (objectID = PRIV_KEY_MODULUS; objectID <= PRIV_KEY_PRIME2; objectID++) for (objectID = PRIV_KEY_MODULUS; objectID <= PRIV_KEY_COEFF; objectID++)
{ {
chunk_t object; chunk_t object;
if (objectID == PRIV_KEY_PRIV_EXP) switch (objectID)
{ {
pgp_sym_alg_t s2k; case PRIV_KEY_PRIV_EXP:
/* string-to-key usage */
s2k = pgp_length(&packet, 1);
DBG2("L3 - string-to-key: %d", s2k);
if (s2k == 255 || s2k == 254)
{ {
DBG1("string-to-key specifiers not supported"); pgp_sym_alg_t s2k;
goto end;
}
DBG2(" %N", pgp_sym_alg_names, s2k);
if (s2k != PGP_SYM_ALG_PLAIN) /* string-to-key usage */
{ s2k = pgp_length(&packet, 1);
DBG1("%N encryption not supported", pgp_sym_alg_names, s2k); DBG2("L3 - string-to-key: %d", s2k);
goto end;
if (s2k == 255 || s2k == 254)
{
DBG1("string-to-key specifiers not supported");
goto end;
}
DBG2(" %N", pgp_sym_alg_names, s2k);
if (s2k != PGP_SYM_ALG_PLAIN)
{
DBG1("%N encryption not supported", pgp_sym_alg_names, s2k);
goto end;
}
break;
} }
case PRIV_KEY_EXP1:
case PRIV_KEY_EXP2:
/* not contained in OpenPGP secret key payload */
continue;
default:
break;
} }
DBG2("L3 - %s:", privkeyObjects[objectID].name); DBG2("L3 - %s:", privkeyObjects[objectID].name);
@@ -884,10 +894,13 @@ static gmp_rsa_private_key_t *load_pgp(chunk_t blob)
mpz_import(this->d, object.len, 1, 1, 1, 0, object.ptr); mpz_import(this->d, object.len, 1, 1, 1, 0, object.ptr);
break; break;
case PRIV_KEY_PRIME1: case PRIV_KEY_PRIME1:
mpz_import(this->p, object.len, 1, 1, 1, 0, object.ptr); mpz_import(this->q, object.len, 1, 1, 1, 0, object.ptr);
break; break;
case PRIV_KEY_PRIME2: case PRIV_KEY_PRIME2:
mpz_import(this->q, object.len, 1, 1, 1, 0, object.ptr); mpz_import(this->p, object.len, 1, 1, 1, 0, object.ptr);
break;
case PRIV_KEY_COEFF:
mpz_import(this->coeff, object.len, 1, 1, 1, 0, object.ptr);
break; break;
} }
} }
@@ -903,12 +916,6 @@ static gmp_rsa_private_key_t *load_pgp(chunk_t blob)
mpz_sub_ui(u, this->q, 1); mpz_sub_ui(u, this->q, 1);
mpz_mod(this->exp2, this->d, u); mpz_mod(this->exp2, this->d, u);
/* coeff = (q^-1) mod p */
mpz_invert(this->coeff, this->q, this->p);
if (mpz_cmp_ui(this->coeff, 0) < 0)
{
mpz_add(this->coeff, this->coeff, this->p);
}
mpz_clear(u); mpz_clear(u);
chunk_clear(&blob); chunk_clear(&blob);