libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

resolve problem with very old compiler and Mac 10.5; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2013-11-12 15:40:55 +00:00
parent 84c3301adc
commit e913a8da13
1 changed files with 139 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/pcsc.hxx
View File

@@ -573,6 +573,10 @@ namespace pcsc {
//................................................................methods
private:
mrw::Shared<Reader> newreader(const std::string& name) {
return new Reader(name, *this);
}
//! Sets state and throws an exception if neccessary.
/*! @throw access_error if it is instanciated for exceptions and
an error occured in the last command. */
@@ -651,17 +655,25 @@ namespace pcsc {
bool check(const std::string& context="") {
if (_exc&&!*this) {
if (context.size()) {
#ifdef SCARD_W_WRONG_CHV
if (_state==SCARD_W_WRONG_CHV) {
throw wrong_pin(context+": "+error());
} else {
#endif
throw access_error(context+": "+error());
#ifdef SCARD_W_WRONG_CHV
}
#endif
} else {
#ifdef SCARD_W_WRONG_CHV
if (_state==SCARD_W_WRONG_CHV) {
throw wrong_pin(error());
} else {
#endif
throw access_error(error());
#ifdef SCARD_W_WRONG_CHV
}
#endif
}
}
return *this;
@@ -671,216 +683,337 @@ namespace pcsc {
std::string error() const {
std::stringstream ss;
switch (_state) {
#ifdef SCARD_E_CANCELLED
case SCARD_E_CANCELLED:
ss<<"The action was canceled by an SCardCancel request.";
break;
#endif
#ifdef SCARD_E_CANT_DISPOSE
case SCARD_E_CANT_DISPOSE:
ss<<"The system could not dispose of the media in the requested"
<<" manner.";
break;
#endif
#ifdef SCARD_E_CARD_UNSUPPORTED
case SCARD_E_CARD_UNSUPPORTED:
ss<<"The smart card does not meet minimal requirements for"
<<" support.";
break;
#endif
#ifdef SCARD_E_DUPLICATE_READER
case SCARD_E_DUPLICATE_READER:
ss<<"The reader driver did not produce a unique reader name.";
break;
#endif
#ifdef SCARD_E_INSUFFICIENT_BUFFER
case SCARD_E_INSUFFICIENT_BUFFER:
ss<<"The data buffer for returned data is too small for the"
<<" returned data.";
break;
#endif
#ifdef SCARD_E_INVALID_ATR
case SCARD_E_INVALID_ATR:
ss<<"An ATR string obtained from the registry is not a valid"
<<" ATR string.";
break;
#endif
#ifdef SCARD_E_INVALID_HANDLE
case SCARD_E_INVALID_HANDLE:
ss<<"The supplied handle was not valid.";
break;
#endif
#ifdef SCARD_E_INVALID_PARAMETER
case SCARD_E_INVALID_PARAMETER:
ss<<"One or more of the supplied parameters could not be properly"
<<" interpreted.";
break;
#endif
#ifdef SCARD_E_INVALID_TARGET
case SCARD_E_INVALID_TARGET:
ss<<"Registry startup information is missing or not valid.";
break;
#endif
#ifdef SCARD_E_INVALID_VALUE
case SCARD_E_INVALID_VALUE:
ss<<"One or more of the supplied parameters values could not"
<<" be properly interpreted.";
break;
#endif
#ifdef SCARD_E_NOT_READY
case SCARD_E_NOT_READY:
ss<<"The reader or smart card is not ready to accept commands.";
break;
#endif
#ifdef SCARD_E_NOT_TRANSACTED
case SCARD_E_NOT_TRANSACTED:
ss<<"An attempt was made to end a nonexistent transaction.";
break;
#endif
#ifdef SCARD_E_NO_MEMORY
case SCARD_E_NO_MEMORY:
ss<<"Not enough memory available to complete this command.";
break;
#endif
#ifdef SCARD_E_NO_SERVICE
case SCARD_E_NO_SERVICE:
ss<<"The smart card resource manager is not running.";
break;
#endif
#ifdef SCARD_E_NO_SMARTCARD
case SCARD_E_NO_SMARTCARD:
ss<<"The operation requires a smart card, but no smart card"
<<" is currently in the device.";
break;
#endif
#ifdef SCARD_E_PCI_TOO_SMALL
case SCARD_E_PCI_TOO_SMALL:
ss<<"The PCI receive buffer was too small.";
break;
#endif
#ifdef SCARD_E_PROTO_MISMATCH
case SCARD_E_PROTO_MISMATCH:
ss<<"The requested protocols are incompatible with the protocol"
<<" currently in use with the smart card.";
break;
#endif
#ifdef SCARD_E_READER_UNAVAILABLE
case SCARD_E_READER_UNAVAILABLE:
ss<<"The specified reader is not currently available for use.";
break;
#endif
#ifdef SCARD_E_READER_UNSUPPORTED
case SCARD_E_READER_UNSUPPORTED:
ss<<"The reader driver does not meet minimal requirements for"
<<" support.";
break;
#endif
#ifdef SCARD_E_SERVICE_STOPPED
case SCARD_E_SERVICE_STOPPED:
ss<<"The smart card resource manager has shut down.";
break;
#endif
#ifdef SCARD_E_SHARING_VIOLATION
case SCARD_E_SHARING_VIOLATION:
ss<<"The smart card cannot be accessed because of other"
<<" outstanding connections.";
break;
#endif
#ifdef SCARD_E_SYSTEM_CANCELLED
case SCARD_E_SYSTEM_CANCELLED:
ss<<"The action was cancelled by the system, presumably to log"
<<" off or shut down.";
break;
#endif
#ifdef SCARD_E_TIMEOUT
case SCARD_E_TIMEOUT:
ss<<"The user-specified time-out value has expired.";
break;
#endif
#ifdef SCARD_E_UNKNOWN_CARD
case SCARD_E_UNKNOWN_CARD:
ss<<"The specified smart card name is not recognized.";
break;
#endif
#ifdef SCARD_E_UNKNOWN_READER
case SCARD_E_UNKNOWN_READER:
ss<<"The specified reader name is not recognized.";
break;
case SCARD_E_UNSUPPORTED_FEATURE:
ss<<"This smart card does not support the requested feature.";
break;
#endif
#ifdef SCARD_F_COMM_ERROR
case SCARD_F_COMM_ERROR:
ss<<"An internal communications error has been detected.";
break;
#endif
#ifdef SCARD_F_INTERNAL_ERROR
case SCARD_F_INTERNAL_ERROR:
ss<<"An internal consistency check failed.";
break;
#endif
#ifdef SCARD_F_UNKNOWN_ERROR
case SCARD_F_UNKNOWN_ERROR:
ss<<"An internal error has been detected, but the source is"
<<" unknown.";
break;
#endif
#ifdef SCARD_F_WAITED_TOO_LONG
case SCARD_F_WAITED_TOO_LONG:
ss<<"An internal consistency timer has expired.";
break;
#endif
#ifdef SCARD_S_SUCCESS
case SCARD_S_SUCCESS:
ss<<"No error was encountered.";
break;
#endif
#ifdef SCARD_W_REMOVED_CARD
case SCARD_W_REMOVED_CARD:
ss<<"The smart card has been removed, so that further"
<<" communication is not possible.";
break;
#endif
#ifdef SCARD_W_RESET_CARD
case SCARD_W_RESET_CARD:
ss<<"The smart card was reset.";
break;
#endif
#ifdef SCARD_W_UNPOWERED_CARD
case SCARD_W_UNPOWERED_CARD:
ss<<"Power has been removed from the smart card, so that"
<<" further communication is not possible.";
break;
#endif
#ifdef SCARD_W_UNRESPONSIVE_CARD
case SCARD_W_UNRESPONSIVE_CARD:
ss<<"The smart card is not responding to a reset.";
break;
#endif
#ifdef SCARD_W_UNSUPPORTED_CARD
case SCARD_W_UNSUPPORTED_CARD:
ss<<"The reader cannot communicate with the smart card,"
<<" due to ATR configuration conflicts.";
break;
#ifndef __APPLE__
#endif
#ifdef SCARD_E_NO_READERS_AVAILABLE
case SCARD_E_NO_READERS_AVAILABLE:
ss<<"No smart card reader is available.";
break;
#endif
#ifdef WIN32
#ifdef ERROR_BROKEN_PIPE
case ERROR_BROKEN_PIPE:
ss<<"The client attempted a smart card operation in a"
<<" remote session, such as a client session running"
<<" on a terminal server, and the operating system in"
<<" use does not support smart card redirection.";
break;
#endif
#ifdef SCARD_E_BAD_SEEK
case SCARD_E_BAD_SEEK:
ss<<"There was an error trying to set the smart card file"
<<" object pointer.";
break;
#endif
#ifdef SCARD_E_CERTIFICATE_UNAVAILABLE
case SCARD_E_CERTIFICATE_UNAVAILABLE:
ss<<"The requested certificate could not be obtained.";
break;
#endif
#ifdef SCARD_E_COMM_DATA_LOST
case SCARD_E_COMM_DATA_LOST:
ss<<"A communications error with the smart card has been detected.";
break;
#endif
#ifdef SCARD_E_DIR_NOT_FOUND
case SCARD_E_DIR_NOT_FOUND:
ss<<"The specified directory does not exist in the smart card.";
break;
#endif
#ifdef SCARD_E_FILE_NOT_FOUND
case SCARD_E_FILE_NOT_FOUND:
ss<<"The specified file does not exist in the smart card.";
break;
#endif
#ifdef SCARD_E_ICC_CREATEORDER
case SCARD_E_ICC_CREATEORDER:
ss<<"The requested order of object creation is not supported.";
break;
#endif
#ifdef SCARD_E_ICC_INSTALLATION
case SCARD_E_ICC_INSTALLATION:
ss<<"No primary provider can be found for the smart card.";
break;
#endif
#ifdef SCARD_E_INVALID_CHV
case SCARD_E_INVALID_CHV:
ss<<"The supplied PIN is incorrect.";
break;
#endif
#ifdef SCARD_E_NO_ACCESS
case SCARD_E_NO_ACCESS:
ss<<"Access is denied to this file.";
break;
#endif
#ifdef SCARD_E_NO_DIR
case SCARD_E_NO_DIR:
ss<<"The supplied path does not represent a smart card directory.";
break;
#endif
#ifdef SCARD_E_NO_FILE
case SCARD_E_NO_FILE:
ss<<"The supplied path does not represent a smart card file.";
break;
#endif
#ifdef SCARD_E_NO_KEY_CONTAINER
case SCARD_E_NO_KEY_CONTAINER:
ss<<"The requested key container does not exist on the smart card.";
break;
#endif
#ifdef SCARD_E_NO_SUCH_CERTIFICATE
case SCARD_E_NO_SUCH_CERTIFICATE:
ss<<"The requested certificate does not exist.";
break;
#endif
#ifdef SCARD_E_SERVER_TOO_BUSY
case SCARD_E_SERVER_TOO_BUSY:
ss<<"The Smart card resource manager is too busy to complete this"
<<" operation.";
break;
#endif
#ifdef SCARD_E_UNSUPPORTED_FEATURE
case SCARD_E_UNSUPPORTED_FEATURE:
ss<<"This smart card does not support the requested feature.";
break;
#else
#ifdef SCARD_E_UNEXPECTED
case SCARD_E_UNEXPECTED:
ss<<"An unexpected card error has occurred.";
break;
#endif
#endif
#ifdef SCARD_E_UNKNOWN_RES_MNG
case SCARD_E_UNKNOWN_RES_MNG:
ss<<"An unrecognized error code was returned from a layered"
<<" component.";
break;
#endif
#ifdef SCARD_E_WRITE_TOO_MANY
case SCARD_E_WRITE_TOO_MANY:
ss<<"The smartcard does not have enough memory to store the"
<<" information.";
break;
#endif
#ifdef SCARD_P_SHUTDOWN
case SCARD_P_SHUTDOWN:
ss<<"The operation has been aborted to allow the server application"
<<" to exit.";
break;
#endif
#ifdef SCARD_W_CANCELLED_BY_USER
case SCARD_W_CANCELLED_BY_USER:
ss<<"The action was cancelled by the user.";
break;
#endif
#ifdef SCARD_W_CARD_NOT_AUTHENTICATED
case SCARD_W_CARD_NOT_AUTHENTICATED:
ss<<"No PIN was presented to the smart card.";
break;
#endif
#ifdef SCARD_W_CHV_BLOCKED
case SCARD_W_CHV_BLOCKED:
ss<<"The card cannot be accessed because the maximum number"
<<" of PIN entry attempts has been reached.";
break;
#endif
#ifdef SCARD_W_EOF
case SCARD_W_EOF:
ss<<"The end of the smart card file has been reached.";
break;
#endif
#ifdef SCARD_W_SECURITY_VIOLATION
case SCARD_W_SECURITY_VIOLATION:
ss<<"Access was denied because of a security violation.";
break;
#endif
#ifdef SCARD_W_WRONG_CHV
case SCARD_W_WRONG_CHV:
ss<<"The card cannot be accessed because the wrong PIN was"
<<" presented.";
@@ -927,7 +1060,7 @@ namespace pcsc {
mrw::Shared<Reader> reader(const std::string& name, Connection* c) {
CRYPTOLOG("get reader: "<<name<<" from "<<(void*)&_readers);
if (_readers.find(name)==_readers.end())
_readers.insert(std::make_pair(name, new Reader(name, *c)));
_readers.insert(std::make_pair(name, c->newreader(name)));
return _readers.find(name)->second;
}