diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-11-10 23:54:04 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-11-10 23:54:04 +0100 |
| commit | f565d0c575f9d7e4a53e10ee447871fea21cb2e3 (patch) | |
| tree | 950b57b988a21db56ded2da3892cfad4dea6b9d4 /src/pluto/smartcard.h | |
| parent | cc543182bcf79b306188262b5537bc55f89c0965 (diff) | |
| download | strongswan-f565d0c575.tar.bz2 strongswan-f565d0c575.tar.xz | |
merged pluto's PGP certificate parsing with charon's
Diffstat (limited to 'src/pluto/smartcard.h')
| -rw-r--r-- | src/pluto/smartcard.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/pluto/smartcard.h b/src/pluto/smartcard.h index 60a0fccfc..7a2229794 100644 --- a/src/pluto/smartcard.h +++ b/src/pluto/smartcard.h @@ -42,7 +42,7 @@ typedef struct smartcard smartcard_t; struct smartcard { smartcard_t *next; time_t last_load; - cert_t last_cert; + cert_t *last_cert; int count; int number; unsigned long slot; @@ -75,8 +75,7 @@ extern void scx_finalize(void); extern bool scx_establish_context(smartcard_t *sc); extern bool scx_login(smartcard_t *sc); extern bool scx_on_smartcard(const char *filename); -extern bool scx_load_cert(const char *filename, smartcard_t **scp - , cert_t *cert, bool *cached); +extern cert_t* scx_load_cert(const char *filename, smartcard_t **scp, bool *cached); extern bool scx_verify_pin(smartcard_t *sc); extern void scx_share(smartcard_t *sc); extern bool scx_sign_hash(smartcard_t *sc, const u_char *in, size_t inlen @@ -90,7 +89,7 @@ extern bool scx_op_via_whack(const char* msg, int inbase, int outbase extern bool scx_get_pin(smartcard_t *sc, int whackfd); extern size_t scx_get_keylength(smartcard_t *sc); extern smartcard_t* scx_add(smartcard_t *sc); -extern smartcard_t* scx_get(x509cert_t *cert); +extern smartcard_t* scx_get(cert_t *cert); extern void scx_release(smartcard_t *sc); extern void scx_release_context(smartcard_t *sc); extern void scx_free_pin(chunk_t *pin); |