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

fixed bug occuring with multiple occurences of the same cacert on a smartcard

Browse Source
This commit is contained in:
Andreas Steffen
2007-08-13 07:47:47 +00:00
parent 8f687a7591
commit 9148e44b39
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/ca.c
+8 -11
View File
@@ -197,7 +197,7 @@ get_authcert(chunk_t subject, chunk_t serial, chunk_t keyid, u_char auth_flags)
/* /*
* add an authority certificate to the chained list * add an authority certificate to the chained list
*/ */
bool x509cert_t*
add_authcert(x509cert_t *cert, u_char auth_flags) add_authcert(x509cert_t *cert, u_char auth_flags)
{ {
x509cert_t *old_cert; x509cert_t *old_cert;
@@ -222,7 +222,7 @@ add_authcert(x509cert_t *cert, u_char auth_flags)
unlock_authcert_list("add_authcert"); unlock_authcert_list("add_authcert");
free_x509cert(cert); free_x509cert(cert);
return FALSE; return old_cert;
} }
else else
{ {
@@ -242,7 +242,7 @@ add_authcert(x509cert_t *cert, u_char auth_flags)
DBG_log(" authcert inserted") DBG_log(" authcert inserted")
) )
unlock_authcert_list("add_authcert"); unlock_authcert_list("add_authcert");
return TRUE; return cert;
} }
/* /*
@@ -623,15 +623,12 @@ add_ca_info(const whack_message_t *msg)
unlock_ca_info_list("add_ca_info"); unlock_ca_info_list("add_ca_info");
/* add cacert to list of authcerts */ /* add cacert to list of authcerts */
if (!cached_cert) if (!cached_cert && sc != NULL)
{ {
if (add_authcert(cacert, AUTH_CA) && sc != NULL) if (sc->last_cert.type == CERT_X509_SIGNATURE)
{ sc->last_cert.u.x509->count--;
if (sc->last_cert.type == CERT_X509_SIGNATURE) sc->last_cert.u.x509 = add_authcert(cacert, AUTH_CA);
sc->last_cert.u.x509->count--; share_cert(sc->last_cert);
sc->last_cert = cert;
share_cert(sc->last_cert);
}
} }
if (sc != NULL) if (sc != NULL)
time(&sc->last_load); time(&sc->last_load);
src/pluto/ca.h
+1 -1
View File
@@ -54,7 +54,7 @@ extern x509cert_t* get_authcert(chunk_t subject, chunk_t serial, chunk_t keyid
, u_char auth_flags); , u_char auth_flags);
extern void load_authcerts(const char *type, const char *path extern void load_authcerts(const char *type, const char *path
, u_char auth_flags); , u_char auth_flags);
extern bool add_authcert(x509cert_t *cert, u_char auth_flags); extern x509cert_t* add_authcert(x509cert_t *cert, u_char auth_flags);
extern void free_authcerts(void); extern void free_authcerts(void);
extern void list_authcerts(const char *caption, u_char auth_flags, bool utc); extern void list_authcerts(const char *caption, u_char auth_flags, bool utc);
extern bool trust_authcert_candidate(const x509cert_t *cert extern bool trust_authcert_candidate(const x509cert_t *cert
src/pluto/smartcard.c
+4 -2
View File
@@ -593,11 +593,13 @@ scx_find_cert_objects(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
/* put end entity and ca certificates into different chains */ /* put end entity and ca certificates into different chains */
if (cert->isCA) if (cert->isCA)
add_authcert(cert, AUTH_CA); {
sc->last_cert.u.x509 = add_authcert(cert, AUTH_CA);
}
else else
{ {
add_x509_public_key(cert, valid_until, DAL_LOCAL); add_x509_public_key(cert, valid_until, DAL_LOCAL);
sc->last_cert.u.x509 = add_x509cert(cert); sc->last_cert.u.x509 = add_x509cert(cert);
} }
share_cert(sc->last_cert); share_cert(sc->last_cert);