giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libopensc: new error code macros -- 'corrupted data' and 'file end reached'

Browse Source 
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5404 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
vtarasov 2011-04-27 14:28:03 +00:00
parent 670942a0b4
commit 5471aea023
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libopensc/errors.c
View File

@ -48,6 +48,7 @@ const char *sc_strerror(int error)
"Reader in use by another application" "Reader in use by another application"
}; };
const int rdr_base = -SC_ERROR_READER; const int rdr_base = -SC_ERROR_READER;
const char *card_errors[] = { const char *card_errors[] = {
"Card command failed", "Card command failed",
"File not found", "File not found",
@ -67,8 +68,11 @@ const char *sc_strerror(int error)
"File already exists", "File already exists",
"Data object not found", "Data object not found",
"Not enough memory on card", "Not enough memory on card",
"Part of returned data may be corrupted",
"End of file/record reached before reading Le bytes"
}; };
const int card_base = -SC_ERROR_CARD_CMD_FAILED; const int card_base = -SC_ERROR_CARD_CMD_FAILED;
const char *arg_errors[] = { const char *arg_errors[] = {
"Invalid arguments", "Invalid arguments",
"UNUSED", "UNUSED",
@ -78,6 +82,7 @@ const char *sc_strerror(int error)
"Invalid data", "Invalid data",
}; };
const int arg_base = -SC_ERROR_INVALID_ARGUMENTS; const int arg_base = -SC_ERROR_INVALID_ARGUMENTS;
const char *int_errors[] = { const char *int_errors[] = {
"Internal error", "Internal error",
"Invalid ASN.1 object", "Invalid ASN.1 object",
@ -98,6 +103,7 @@ const char *sc_strerror(int error)
"Not implemented" "Not implemented"
}; };
const int int_base = -SC_ERROR_INTERNAL; const int int_base = -SC_ERROR_INTERNAL;
const char *p15i_errors[] = { const char *p15i_errors[] = {
"Generic PKCS#15 initialization error", "Generic PKCS#15 initialization error",
"Syntax error", "Syntax error",
@ -112,12 +118,14 @@ const char *sc_strerror(int error)
"File too small", "File too small",
}; };
const int p15i_base = -SC_ERROR_PKCS15INIT; const int p15i_base = -SC_ERROR_PKCS15INIT;
const char *misc_errors[] = { const char *misc_errors[] = {
"Unknown error", "Unknown error",
"PKCS#15 compatible smart card not found", "PKCS#15 compatible smart card not found",
}; };
const char *no_errors = "Success";
const int misc_base = -SC_ERROR_UNKNOWN; const int misc_base = -SC_ERROR_UNKNOWN;
const char *no_errors = "Success";
const char **errors = NULL; const char **errors = NULL;
int count = 0, err_base = 0; int count = 0, err_base = 0;
@ -125,6 +133,7 @@ const char *sc_strerror(int error)
return no_errors; return no_errors;
if (error < 0) if (error < 0)
error = -error; error = -error;
if (error >= misc_base) { if (error >= misc_base) {
errors = misc_errors; errors = misc_errors;
count = DIM(misc_errors); count = DIM(misc_errors);

2
src/libopensc/errors.h
View File

@ -65,6 +65,8 @@ extern "C" {
#define SC_ERROR_FILE_ALREADY_EXISTS -1215 #define SC_ERROR_FILE_ALREADY_EXISTS -1215
#define SC_ERROR_DATA_OBJECT_NOT_FOUND -1216 #define SC_ERROR_DATA_OBJECT_NOT_FOUND -1216
#define SC_ERROR_NOT_ENOUGH_MEMORY -1217 #define SC_ERROR_NOT_ENOUGH_MEMORY -1217
#define SC_ERROR_CORRUPTED_DATA -1218
#define SC_ERROR_FILE_END_REACHED -1219
/* Returned by OpenSC library when called with invalid arguments */ /* Returned by OpenSC library when called with invalid arguments */
#define SC_ERROR_INVALID_ARGUMENTS -1300 #define SC_ERROR_INVALID_ARGUMENTS -1300