diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-06-07 18:48:39 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-06-07 19:17:59 +0900 |
| commit | d78af7ef5567e6b94085f4e5273f9b1169a95d08 (patch) | |
| tree | cd8d4f860fe0cb5eeffe2642c45a7fd848f3edbc | |
| parent | 444839e053e8eebd4d8c8da72b361b63a458d8f4 (diff) | |
| download | tdelibs-d78af7ef5567e6b94085f4e5273f9b1169a95d08.tar.gz tdelibs-d78af7ef5567e6b94085f4e5273f9b1169a95d08.zip | |
Minor code refactoring of previous 2 commits.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | tdecore/tdehw/tdecryptographiccarddevice.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index d20dbbb03..c593d2ab6 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -635,7 +635,6 @@ TQString TDECryptographicCardDevice::autoPIN() { ASN1_TYPE* asnValue = otherName->value; if (asnValue) { // Found autopin structure - int index; ASN1_TYPE* asnSeqValue = NULL; ASN1_GENERALSTRING* asnGeneralString = NULL; STACK_OF(ASN1_TYPE) *asnSeqValueStack = NULL; @@ -643,17 +642,14 @@ TQString TDECryptographicCardDevice::autoPIN() { int asn1SeqValueObjectTag; int asn1SeqValueObjectClass; int returnCode; -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - uint8_t* asnSeqValueString = ASN1_STRING_data(asnValue->value.sequence); -#else - const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence); -#endif + int index = 0; // Search for the PIN field - index = 0; // Search for the PIN field -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free); -#else +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence); asnSeqValueStack = d2i_ASN1_SEQUENCE_ANY(NULL, &asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence)); +#else + uint8_t* asnSeqValueString = ASN1_STRING_data(asnValue->value.sequence); + asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free); #endif asnSeqValue = sk_ASN1_TYPE_value(asnSeqValueStack, index); if (asnSeqValue) { @@ -663,10 +659,10 @@ TQString TDECryptographicCardDevice::autoPIN() { if (!(returnCode & 0x80)) { if (returnCode == (V_ASN1_CONSTRUCTED + index)) { if (d2i_ASN1_GENERALSTRING(&asnGeneralString, &asn1SeqValueObjectData, asn1SeqValueObjectLength) != NULL) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - retString = TQString((const char *)ASN1_STRING_data(asnGeneralString)); -#else +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) retString = TQString((const char *)ASN1_STRING_get0_data(asnGeneralString)); +#else + retString = TQString((const char *)ASN1_STRING_data(asnGeneralString)); #endif } } |