TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Minor code refactoring of previous 2 commits.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/85/head
Michele Calgaro 5 years ago
parent 444839e053
commit d78af7ef55
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File

22
tdecore/tdehw/tdecryptographiccarddevice.cpp
Unescape View File

@ -635,7 +635,6 @@ TQString TDECryptographicCardDevice::autoPIN() {
ASN1_TYPE* asnValue = otherName->value; ASN1_TYPE* asnValue = otherName->value;
if (asnValue) { if (asnValue) {
// Found autopin structure // Found autopin structure
int index;
ASN1_TYPE* asnSeqValue = NULL; ASN1_TYPE* asnSeqValue = NULL;
ASN1_GENERALSTRING* asnGeneralString = NULL; ASN1_GENERALSTRING* asnGeneralString = NULL;
STACK_OF(ASN1_TYPE) *asnSeqValueStack = NULL; STACK_OF(ASN1_TYPE) *asnSeqValueStack = NULL;
@ -643,17 +642,14 @@ TQString TDECryptographicCardDevice::autoPIN() {
int asn1SeqValueObjectTag; int asn1SeqValueObjectTag;
int asn1SeqValueObjectClass; int asn1SeqValueObjectClass;
int returnCode; int returnCode;
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) int index = 0; // Search for the PIN field
uint8_t* asnSeqValueString = ASN1_STRING_data(asnValue->value.sequence);
#else
const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence);
#endif
index = 0; // Search for the PIN field #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence);
asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free);
#else
asnSeqValueStack = d2i_ASN1_SEQUENCE_ANY(NULL, &asnSeqValueString, ASN1_STRING_length(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 #endif
asnSeqValue = sk_ASN1_TYPE_value(asnSeqValueStack, index); asnSeqValue = sk_ASN1_TYPE_value(asnSeqValueStack, index);
if (asnSeqValue) { if (asnSeqValue) {
@ -663,10 +659,10 @@ TQString TDECryptographicCardDevice::autoPIN() {
if (!(returnCode & 0x80)) { if (!(returnCode & 0x80)) {
if (returnCode == (V_ASN1_CONSTRUCTED + index)) { if (returnCode == (V_ASN1_CONSTRUCTED + index)) {
if (d2i_ASN1_GENERALSTRING(&asnGeneralString, &asn1SeqValueObjectData, asn1SeqValueObjectLength) != NULL) { if (d2i_ASN1_GENERALSTRING(&asnGeneralString, &asn1SeqValueObjectData, asn1SeqValueObjectLength) != NULL) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
retString = TQString((const char *)ASN1_STRING_data(asnGeneralString));
#else
retString = TQString((const char *)ASN1_STRING_get0_data(asnGeneralString)); retString = TQString((const char *)ASN1_STRING_get0_data(asnGeneralString));
#else
retString = TQString((const char *)ASN1_STRING_data(asnGeneralString));
#endif #endif
} }
} }

Write Preview
Loading…
Cancel
Save