VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

- fixed includes

Browse Source 
- fixed return value from pace_test if NO_PACE is defined


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@43 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-03-05 22:35:40 +00:00
parent d91b45c47a
commit 0aab9bb184
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ccid/pace.c
View File

@@ -16,8 +16,10 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* ccid. If not, see <http://www.gnu.org/licenses/>. * ccid. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <opensc/log.h>
#include "pace.h" #include "pace.h"
#include <opensc/log.h>
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#define ASN1_APP_EXP_OPT(stname, field, type, tag) ASN1_EX_TYPE(ASN1_TFLG_EXPTAG|ASN1_TFLG_APPLICATION|ASN1_TFLG_OPTIONAL, tag, stname, field, type) #define ASN1_APP_EXP_OPT(stname, field, type, tag) ASN1_EX_TYPE(ASN1_TFLG_EXPTAG|ASN1_TFLG_APPLICATION|ASN1_TFLG_OPTIONAL, tag, stname, field, type)
@@ -131,18 +133,20 @@ inline int EstablishPACEChannel(sc_context_t *ctx, sc_card_t *card,
const __u8 *in, __u8 **out, size_t *outlen) { const __u8 *in, __u8 **out, size_t *outlen) {
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_DEBUG, SC_ERROR_NOT_SUPPORTED); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_DEBUG, SC_ERROR_NOT_SUPPORTED);
} }
void pace_test(sc_context_t *ctx, sc_card_t *card) { int pace_test(sc_context_t *ctx, sc_card_t *card) {
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_DEBUG, SC_ERROR_NOT_SUPPORTED); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_DEBUG, SC_ERROR_NOT_SUPPORTED);
} }
#else #else
#include <asm/byteorder.h>
#include <opensc/opensc.h> #include <opensc/opensc.h>
#include <opensc/ui.h> #include <opensc/ui.h>
#include <openssl/objects.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <asm/byteorder.h> #include <openssl/objects.h>
#include <string.h>
#include <openssl/pace.h> #include <openssl/pace.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
uint16_t ssc = 0; uint16_t ssc = 0;

3
ccid/pace.h
View File

@@ -20,8 +20,7 @@
#define _PACE_H #define _PACE_H
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <openssl/asn1.h> #include <opensc/opensc.h>
#include <openssl/asn1t.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {