libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

typos; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2013-10-10 12:23:30 +00:00
parent d9d0f2875f
commit fc85aab326
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptoki.cxx
View File

@@ -219,7 +219,7 @@ namespace cryptoki {
if (!*this) return res; if (!*this) return res;
for (CK_ULONG i(0); i<count; ++i) { for (CK_ULONG i(0); i<count; ++i) {
Slot s(*this, slots[i]); Slot s(*this, slots[i]);
if (!name.size() || name==s.slotInfo().slotDescription) if (!name.size() || name==s.slotinfo().slotDescription)
res.push_back(s); res.push_back(s);
} }
} catch (...) { } catch (...) {

9
src/openssl.hxx
View File

@@ -25,9 +25,9 @@
# error OpenSSL Version Number not Found # error OpenSSL Version Number not Found
#elif OPENSSL_VERSION_NUMBER < 0x00908000L #elif OPENSSL_VERSION_NUMBER < 0x00908000L
# ifdef ALLOW_SSL_OLDER_THAN_0_8 # ifdef ALLOW_SSL_OLDER_THAN_0_8
# warning OpenSSL older than 0.8 detected # warning OpenSSL older than 0.8 detected please upgrade to 1.0
# else # else
# error OpenSSL older than 0.8 detected # error OpenSSL older than 0.8 detected please upgrade to 1.0
# endif # endif
# define OPENSSL_0_7 # define OPENSSL_0_7
# define V0_CONST # define V0_CONST
@@ -35,16 +35,15 @@
# define CV_X509 # define CV_X509
#elif OPENSSL_VERSION_NUMBER < 0x10000000L #elif OPENSSL_VERSION_NUMBER < 0x10000000L
# ifdef ALLOW_SSL_0_8 # ifdef ALLOW_SSL_0_8
# warning OpenSSL 0.8 detected # warning OpenSSL 0.8 detected please upgrade to 1.0
# else # else
# error OpenSSL 0.8 detected # error OpenSSL 0.8 detected please upgrade to 1.0
# endif # endif
# define OPENSSL_0_8 # define OPENSSL_0_8
# define V0_CONST const # define V0_CONST const
# define CV_STACK # define CV_STACK
# define CV_X509 # define CV_X509
#else #else
# warning current OpenSSL 1.0 detected
# define OPENSSL_1_0 # define OPENSSL_1_0
# define V0_CONST const # define V0_CONST const
# define CV_STACK (_STACK*) # define CV_STACK (_STACK*)

4
src/pcsc.hxx
View File

@@ -555,8 +555,8 @@ namespace pcsc {
Strings res; Strings res;
pcsc::Connection::Strings readers(scan()); pcsc::Connection::Strings readers(scan());
for (pcsc::Connection::Strings::const_iterator it(readers.begin()); for (pcsc::Connection::Strings::const_iterator it(readers.begin());
it!=readers.end(); ++it) it!=readers.end(); ++it)
if (_reader[*it].status().atr.find(atr)!=string::npos) if (_reader[*it]->status().atr.find(atr)!=string::npos)
res.push_back(*it); res.push_back(*it);
return res; return res;
} }