From c1b0626cdd06780c6bcbe07e82e3260372aa2a8d Mon Sep 17 00:00:00 2001 From: aet Date: Wed, 2 Feb 2005 10:21:10 +0000 Subject: [PATCH] - Cleanup, typo fix git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2123 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/asn1.h | 4 ++-- src/libopensc/cardctl.h | 4 ++-- src/libopensc/emv.h | 4 ++-- src/libopensc/errors.h | 4 ++-- src/libopensc/internal.h | 4 ++-- src/libopensc/opensc.h | 6 +++--- src/libopensc/pkcs15.h | 4 ++-- src/libopensc/types.h | 4 ++-- src/pkcs15init/keycache.h | 4 ++-- src/pkcs15init/pkcs15-init.h | 4 ++-- src/pkcs15init/profile.h | 4 ++-- src/sslengines/pkcs11-internal.h | 2 +- src/tests/sc-test.h | 4 ++-- src/tools/util.h | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/libopensc/asn1.h b/src/libopensc/asn1.h index 71a3181c..f9a4a3df 100644 --- a/src/libopensc/asn1.h +++ b/src/libopensc/asn1.h @@ -21,7 +21,7 @@ #ifndef _OPENSC_ASN1_H #define _OPENSC_ASN1_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -192,7 +192,7 @@ void sc_asn1_clear_algorithm_id(struct sc_algorithm_id *); #define ASN1_UNIVERSALSTRING 28 #define ASN1_BMPSTRING 30 -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/cardctl.h b/src/libopensc/cardctl.h index b05a4d54..d969958c 100644 --- a/src/libopensc/cardctl.h +++ b/src/libopensc/cardctl.h @@ -17,7 +17,7 @@ #include -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -280,7 +280,7 @@ struct sc_cardctl_oberthur_createpin_info { unsigned int puk_tries; }; -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/emv.h b/src/libopensc/emv.h index 2cdf0096..a9b0c496 100644 --- a/src/libopensc/emv.h +++ b/src/libopensc/emv.h @@ -23,7 +23,7 @@ #include -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -34,7 +34,7 @@ struct sc_emv_card { int sc_emv_bind(struct sc_card *card, struct sc_emv_card **emv_card); int sc_emv_unbind(struct sc_emv_card *emv_card); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/errors.h b/src/libopensc/errors.h index 8a5eb94c..88299678 100644 --- a/src/libopensc/errors.h +++ b/src/libopensc/errors.h @@ -21,7 +21,7 @@ #ifndef _OPENSC_ERRORS_H #define _OPENSC_ERRORS_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -109,7 +109,7 @@ extern "C" { const char *sc_strerror(int sc_errno); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/internal.h b/src/libopensc/internal.h index a073bffe..ab5907df 100644 --- a/src/libopensc/internal.h +++ b/src/libopensc/internal.h @@ -25,7 +25,7 @@ #include #endif -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -68,7 +68,7 @@ struct sc_algorithm_info * _sc_card_find_rsa_alg(struct sc_card *card, int sc_asn1_read_tag(const u8 ** buf, size_t buflen, unsigned int *cla_out, unsigned int *tag_out, size_t *taglen); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/opensc.h b/src/libopensc/opensc.h index 4b66feb8..8fb52c10 100644 --- a/src/libopensc/opensc.h +++ b/src/libopensc/opensc.h @@ -28,7 +28,7 @@ #include -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -117,7 +117,7 @@ extern "C" { #define SC_MAX_PIN_SIZE 256 /* OpenPGP card has 254 max */ #define SC_MAX_ATR_SIZE 33 #define SC_MAX_AID_SIZE 16 -/* Beware: the following needs to be a mutiple of 4 +/* Beware: the following needs to be a multiple of 4 * or else sc_update_binary will not work on GPK */ #define SC_APDU_CHOP_SIZE 248 @@ -895,7 +895,7 @@ extern struct sc_card_driver *sc_get_jcop_driver(void); extern struct sc_card_driver *sc_get_oberthur_driver(void); extern struct sc_card_driver *sc_get_belpic_driver(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/pkcs15.h b/src/libopensc/pkcs15.h index 390d796e..fb36da0c 100644 --- a/src/libopensc/pkcs15.h +++ b/src/libopensc/pkcs15.h @@ -21,7 +21,7 @@ #ifndef _OPENSC_PKCS15_H #define _OPENSC_PKCS15_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -649,7 +649,7 @@ int sc_pkcs15emu_add_pubkey(sc_pkcs15_card_t *p15card, int type, unsigned int modulus_length, int usage, const sc_path_t *path, int ref, const sc_pkcs15_id_t *auth_id, int obj_flags); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/libopensc/types.h b/src/libopensc/types.h index 5beebf66..54d8e3c9 100644 --- a/src/libopensc/types.h +++ b/src/libopensc/types.h @@ -21,7 +21,7 @@ #ifndef _OPENSC_TYPES_H #define _OPENSC_TYPES_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -105,7 +105,7 @@ typedef struct sc_apdu { unsigned int sw1, sw2; /* Status words returned in R-APDU */ } sc_apdu_t; -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/pkcs15init/keycache.h b/src/pkcs15init/keycache.h index 76dadd2f..3c2e0190 100644 --- a/src/pkcs15init/keycache.h +++ b/src/pkcs15init/keycache.h @@ -21,7 +21,7 @@ #ifndef _PKCS15INIT_KEYCACHE_H #define _PKCS15INIT_KEYCACHE_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -37,7 +37,7 @@ extern int sc_keycache_get_key(const sc_path_t *, int, int, unsigned char *, siz extern const u8 *sc_keycache_get_pin(const sc_path_t *, int); extern void sc_keycache_forget_key(const sc_path_t *, int, int); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/pkcs15init/pkcs15-init.h b/src/pkcs15init/pkcs15-init.h index acaaaf05..7c403a7a 100644 --- a/src/pkcs15init/pkcs15-init.h +++ b/src/pkcs15init/pkcs15-init.h @@ -7,7 +7,7 @@ #ifndef PKCS15_INIT_H #define PKCS15_INIT_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -369,7 +369,7 @@ extern struct sc_pkcs15init_operations *sc_pkcs15init_get_jcop_ops(void); extern struct sc_pkcs15init_operations *sc_pkcs15init_get_starcos_ops(void); extern struct sc_pkcs15init_operations *sc_pkcs15init_get_oberthur_ops(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/pkcs15init/profile.h b/src/pkcs15init/profile.h index 05bf62db..a943156a 100644 --- a/src/pkcs15init/profile.h +++ b/src/pkcs15init/profile.h @@ -7,7 +7,7 @@ #ifndef _OPENSC_PROFILE_H #define _OPENSC_PROFILE_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -144,7 +144,7 @@ int sc_profile_instantiate_template(struct sc_profile *, int sc_profile_add_file(struct sc_profile *, const char *, sc_file_t *); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/sslengines/pkcs11-internal.h b/src/sslengines/pkcs11-internal.h index fe03432c..032f397b 100644 --- a/src/sslengines/pkcs11-internal.h +++ b/src/sslengines/pkcs11-internal.h @@ -328,7 +328,7 @@ extern void *memdup(const void *, size_t); extern PKCS11_KEY_ops pkcs11_rsa_ops; -#ifdef __cplusplus +#ifdef __cplusplus } #endif #endif diff --git a/src/tests/sc-test.h b/src/tests/sc-test.h index 77ba49da..02a1e23d 100644 --- a/src/tests/sc-test.h +++ b/src/tests/sc-test.h @@ -1,7 +1,7 @@ #ifndef _SC_TEST_H #define _SC_TEST_H -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -15,7 +15,7 @@ void sc_test_cleanup(); void sc_test_print_card(const struct sc_pkcs15_card *); void sc_test_print_object(const struct sc_pkcs15_object *); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/src/tools/util.h b/src/tools/util.h index 14d1bab6..1ad1f813 100644 --- a/src/tools/util.h +++ b/src/tools/util.h @@ -21,7 +21,7 @@ #include #include -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -42,7 +42,7 @@ int connect_card(struct sc_context *, struct sc_card **, int reader_id, int slot_id, int wait, int verbose); int parse_application_id(struct sc_object_id *oid, char *oid_str); -#ifdef __cplusplus +#ifdef __cplusplus } #endif