Skip to content

Bugfix: API mismatch with crypto++ 6.0.0 - #120

Closed
TommyJerryMairo wants to merge 2 commits into
amule-project:masterfrom
TommyJerryMairo:master
Closed

Bugfix: API mismatch with crypto++ 6.0.0#120
TommyJerryMairo wants to merge 2 commits into
amule-project:masterfrom
TommyJerryMairo:master

Conversation

@TommyJerryMairo

Copy link
Copy Markdown
Contributor

As mentioned in this issue, there is an API mismatch with crypto++ new version 6.0.0 so this commit is aiming to fix that mismatch.

@TommyJerryMairo TommyJerryMairo mentioned this pull request Feb 4, 2018
@Vollstrecker

Copy link
Copy Markdown
Collaborator

I didn't check if you really get the same results with this, but have another question: Will this compile with pre-6 cryptopp, too?

kwizart pushed a commit to rpmfusion/amule that referenced this pull request Feb 26, 2018
@sergiomb2

Copy link
Copy Markdown
Contributor

I didn't check if you really get the same results with this, but have another question: Will this compile with pre-6 cryptopp, too?

it built correctly with cryptopp-5.6.3

Comment thread src/ClientCreditsList.cpp Outdated
CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
pubkey.DEREncode(asink);
pubkey.AccessMaterial().Save(asink);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although the use of AccessMaterial() complies with the comment on AsymmetricAlgorithm, I'd rather use GetMaterial() instead, because

  • it returns a const reference to the data, and
  • the original implementation used it too.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so could you fix this commit ? please

@gonosztopi gonosztopi assigned gonosztopi and unassigned gonosztopi Mar 21, 2018
@TommyJerryMairo

Copy link
Copy Markdown
Contributor Author

Updated.

@gonosztopi

Copy link
Copy Markdown
Member

Merged, the two commits squashed into one.

@gonosztopi gonosztopi closed this Mar 21, 2018
got3nks added a commit to got3nks/amule that referenced this pull request Jun 15, 2026
Reported in amule-project#162. The Server Info tab in the Network panel kept
displaying messages from the disconnected server because there was no
clear-on-disconnect path — the cumulative `server_msg` buffer
(monolithic) and the diff-snapshot / on-screen text ctrl
(amulegui post-amule-project#120) just kept accumulating.

Adds a small ClearServerInfo() on each app variant:

  - CamuleApp::ClearServerInfo()           — clears server_msg.
  - CamuleRemoteGuiApp::ClearServerInfo()  — sends EC_OP_CLEAR_SERVERINFO
                                             to amuled and clears
                                             m_serverinfo_handler.m_seenSoFar.

CamuleDlg::ShowConnectionState tracks the previous ed2k state via a
static bool and on a connected -> disconnected transition calls both
theApp->ClearServerInfo() (data) and ResetLog(ID_SERVERINFO) (UI).
The dialog does the UI clear so the data-side method stays compilable
in the daemon build (amuledlg lives on CamuleGuiBase which CamuleApp
doesn't inherit).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants