merged pluto's PGP certificate parsing with charon's

2009-11-10 23:54:04 +01:00
parent cc543182bc
commit f565d0c575
25 changed files with 471 additions and 1087 deletions
@@ -199,9 +199,10 @@ struct db_context *ike_alg_db_new(connection_t *c, lset_t policy)
 			key_type_t key_type = KEY_ANY;


-			if (c->spd.this.cert.type != CERT_NONE)
+			if (c->spd.this.cert)
 			{
-				public_key_t *key = cert_get_public_key(c->spd.this.cert);
+				certificate_t *certificate = c->spd.this.cert->cert;
+				public_key_t *key = certificate->get_public_key(certificate);

 				if (key == NULL)
 				{