Merge branch 'master' into aidan/dev

This commit is contained in:
R. Aidan Campbell 2018-04-30 18:44:41 -07:00
commit de08b527f8

View File

@ -96,7 +96,7 @@ NvPairingManager::getSignatureFromPemCert(QByteArray certificate)
X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
BIO_free_all(bio);
const ASN1_BIT_STRING *asnSignature;
ASN1_BIT_STRING* asnSignature;
X509_get0_signature(&asnSignature, NULL, cert);
QByteArray signature(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
@ -230,7 +230,7 @@ NvPairingManager::pair(QString serverInfo, QString pin)
QByteArray challengeResponse;
QByteArray serverResponse(challengeResponseData.data(), hashLength);
const ASN1_BIT_STRING *asnSignature;
ASN1_BIT_STRING* asnSignature;
X509_get0_signature(&asnSignature, NULL, m_Cert);
challengeResponse.append(challengeResponseData.data() + hashLength, 16);