ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

removed obsolete pgp private key parsing, done by libstrongswan

This commit is contained in:
Martin Willi 2009-08-12 16:14:26 +02:00
parent dc816eacdf
commit c486fa8158
3 changed files with 30 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pluto/certs.c
View File

@ -232,7 +232,7 @@ bool load_cert(char *filename, const char *label, cert_t *cert)
{ {
pgpcert_t *pgpcert = malloc_thing(pgpcert_t); pgpcert_t *pgpcert = malloc_thing(pgpcert_t);
*pgpcert = pgpcert_empty; *pgpcert = pgpcert_empty;
if (parse_pgp(blob, pgpcert, NULL)) if (parse_pgp(blob, pgpcert))
{ {
cert->type = CERT_PGP; cert->type = CERT_PGP;
cert->u.pgp = pgpcert; cert->u.pgp = pgpcert;

118
src/pluto/pgpcert.c
View File

@ -238,59 +238,22 @@ static bool parse_pgp_pubkey_packet(chunk_t *packet, pgpcert_t *cert)
return TRUE; return TRUE;
} }
/* bool parse_pgp(chunk_t blob, pgpcert_t *cert)
* Parse OpenPGP secret key packet defined in section 5.5.3 of RFC 4880
*/
static bool parse_pgp_secretkey_packet(chunk_t *packet, private_key_t **key)
{
pgp_pubkey_alg_t pubkey_alg;
pgpcert_t cert = pgpcert_empty;
if (!parse_pgp_pubkey_version_validity(packet, &cert))
{
return FALSE;
}
/* public key algorithm - 1 byte */
pubkey_alg = pgp_length(packet, 1);
DBG(DBG_PARSING,
DBG_log("L3 - public key algorithm:");
DBG_log(" %N", pgp_pubkey_alg_names, pubkey_alg)
)
switch (pubkey_alg)
{
case PGP_PUBKEY_ALG_RSA:
case PGP_PUBKEY_ALG_RSA_SIGN_ONLY:
*key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
BUILD_BLOB_PGP, *packet,
BUILD_END);
break;
default:
plog(" non RSA private keys not supported");
return FALSE;
}
return (*key != NULL);
}
bool parse_pgp(chunk_t blob, pgpcert_t *cert, private_key_t **key)
{ {
DBG(DBG_PARSING, DBG(DBG_PARSING,
DBG_log("L0 - PGP file:") DBG_log("L0 - PGP file:")
) )
DBG_cond_dump_chunk(DBG_RAW, "", blob); DBG_cond_dump_chunk(DBG_RAW, "", blob);
if (cert != NULL) if (cert == NULL)
{
/* parse a PGP certificate file */
cert->certificate = blob;
time(&cert->installed);
}
else if (key == NULL)
{ {
/* should not occur, nothing to parse */ /* should not occur, nothing to parse */
return FALSE; return FALSE;
} }
/* parse a PGP certificate file */
cert->certificate = blob;
time(&cert->installed);
while (blob.len > 0) while (blob.len > 0)
{ {
@ -330,54 +293,29 @@ bool parse_pgp(chunk_t blob, pgpcert_t *cert, private_key_t **key)
) )
DBG_cond_dump_chunk(DBG_RAW, "", packet); DBG_cond_dump_chunk(DBG_RAW, "", packet);
if (cert != NULL) /* parse a PGP certificate */
switch (packet_type)
{ {
/* parse a PGP certificate */ case PGP_PKT_PUBLIC_KEY:
switch (packet_type) if (!parse_pgp_pubkey_packet(&packet, cert))
{ {
case PGP_PKT_PUBLIC_KEY: return FALSE;
if (!parse_pgp_pubkey_packet(&packet, cert)) }
{ break;
return FALSE; case PGP_PKT_SIGNATURE:
} if (!parse_pgp_signature_packet(&packet, cert))
break; {
case PGP_PKT_SIGNATURE: return FALSE;
if (!parse_pgp_signature_packet(&packet, cert)) }
{ break;
return FALSE; case PGP_PKT_USER_ID:
} DBG(DBG_PARSING,
break; DBG_log("L3 - user ID:");
case PGP_PKT_USER_ID: DBG_log(" '%.*s'", (int)packet.len, packet.ptr)
DBG(DBG_PARSING, )
DBG_log("L3 - user ID:"); break;
DBG_log(" '%.*s'", (int)packet.len, packet.ptr) default:
) break;
break;
default:
break;
}
}
else
{
/* parse a PGP private key file */
switch (packet_type)
{
case PGP_PKT_SECRET_KEY:
if (!parse_pgp_secretkey_packet(&packet, key))
{
return FALSE;
}
break;
case PGP_PKT_USER_ID:
DBG(DBG_PARSING,
DBG_log("L3 - user ID:");
DBG_log(" '%.*s'", (int)packet.len, packet.ptr)
)
break;
default:
break;
}
} }
} }
} }

2
src/pluto/pgpcert.h
View File

@ -45,7 +45,7 @@ struct pgpcert {
}; };
extern const pgpcert_t pgpcert_empty; extern const pgpcert_t pgpcert_empty;
extern bool parse_pgp(chunk_t blob, pgpcert_t *cert, private_key_t **key); extern bool parse_pgp(chunk_t blob, pgpcert_t *cert);
extern void share_pgpcert(pgpcert_t *cert); extern void share_pgpcert(pgpcert_t *cert);
extern void select_pgpcert_id(pgpcert_t *cert, struct id *end_id); extern void select_pgpcert_id(pgpcert_t *cert, struct id *end_id);
extern pgpcert_t* add_pgpcert(pgpcert_t *cert); extern pgpcert_t* add_pgpcert(pgpcert_t *cert);