Merge pull request #6484

5e56ef5 qt: use CHashWriter also in SignVerifyMessageDialog (Pavel Vasin)
This commit is contained in:
Wladimir J. van der Laan 2015-07-28 11:05:20 +02:00
commit 1369d699b6
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 4 additions and 4 deletions

View File

@ -148,12 +148,12 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
return; return;
} }
CDataStream ss(SER_GETHASH, 0); CHashWriter ss(SER_GETHASH, 0);
ss << strMessageMagic; ss << strMessageMagic;
ss << ui->messageIn_SM->document()->toPlainText().toStdString(); ss << ui->messageIn_SM->document()->toPlainText().toStdString();
std::vector<unsigned char> vchSig; std::vector<unsigned char> vchSig;
if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig)) if (!key.SignCompact(ss.GetHash(), vchSig))
{ {
ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }"); ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
ui->statusLabel_SM->setText(QString("<nobr>") + tr("Message signing failed.") + QString("</nobr>")); ui->statusLabel_SM->setText(QString("<nobr>") + tr("Message signing failed.") + QString("</nobr>"));
@ -223,12 +223,12 @@ void SignVerifyMessageDialog::on_verifyMessageButton_VM_clicked()
return; return;
} }
CDataStream ss(SER_GETHASH, 0); CHashWriter ss(SER_GETHASH, 0);
ss << strMessageMagic; ss << strMessageMagic;
ss << ui->messageIn_VM->document()->toPlainText().toStdString(); ss << ui->messageIn_VM->document()->toPlainText().toStdString();
CPubKey pubkey; CPubKey pubkey;
if (!pubkey.RecoverCompact(Hash(ss.begin(), ss.end()), vchSig)) if (!pubkey.RecoverCompact(ss.GetHash(), vchSig))
{ {
ui->signatureIn_VM->setValid(false); ui->signatureIn_VM->setValid(false);
ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }"); ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }");