Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MurmurIce: remove ad-hoc RSA checks in updateCertificate with Server::isKeyForCert(). #2880

Merged

Conversation

@mkrautz
Copy link
Member

commented Feb 26, 2017

The ad-hoc RSA checks in updateCertificate are unnecessary: we already have a
function that can check whether a given certificate belongs to a given private
key: Server::isKeyForCert().

Rip out the old RSA-specific code (which limited updateCertificate() to only
work with RSA keys), with the more general Server::isKeyForCert().

@mkrautz mkrautz force-pushed the mkrautz:murmurice-remove-ad-hoc-rsa-checks branch from a0fe23b to f47d7a0 Feb 26, 2017

@davidebeatrici

This comment has been minimized.

Copy link
Member

commented Feb 26, 2017

MurmurIce.cpp:1562: error: no matching function for call to ‘Server::isKeyForCert(QSslCertificate&, QSslKey&)’
  if (!::Server::isKeyForCert(cert, privKey)) {
                                           ^
MurmurIce: remove ad-hoc RSA checks in updateCertificate with Server:…
…:isKeyForCert().

The ad-hoc RSA checks in updateCertificate are unnecessary: we already have a
function that can check whether a given certificate belongs to a given private
key: Server::isKeyForCert().

Rip out the old RSA-specific code (which limited updateCertificate() to only
work with RSA keys), with the more general Server::isKeyForCert().

@mkrautz mkrautz force-pushed the mkrautz:murmurice-remove-ad-hoc-rsa-checks branch from f47d7a0 to 01f91ec Feb 26, 2017

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Feb 26, 2017

@davidebeatrici said:

MurmurIce.cpp:1562: error: no matching function for call to ‘Server::isKeyForCert(QSslCertificate&,, QSslKey&)’
  if (!::Server::isKeyForCert(cert, privKey)) {
                                           ^

Fixed

@mkrautz mkrautz merged commit 85d6239 into mumble-voip:master Feb 26, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.