Skip to content

crypto: add optional callback to crypto.sign and crypto.verify #37500

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.

Sign up for GitHub

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

Closed
panva wants to merge 11 commits into from
Closed

crypto: add optional callback to crypto.sign and crypto.verify #37500

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3cf3b94
crypto: add optional callback to crypto.sign and crypto.verify
panva Feb 24, 2021
26c3c3d
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Feb 24, 2021
0788fca
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Feb 24, 2021
c5f956f
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Feb 25, 2021
66b1802
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Feb 26, 2021
53169cc
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 1, 2021
b4f69b8
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 1, 2021
0c9f8cf
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 8, 2021
f26d4b0
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 8, 2021
670960f
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 8, 2021
78440b9
fixup! crypto: add optional callback to crypto.sign and crypto.verify
panva Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! crypto: add optional callback to crypto.sign and crypto.verify
  • Loading branch information
@panva
panva committed Mar 10, 2021
commit 78440b915ef01dda900a3d898fbee2c08d7dc8f4
15 changes: 9 additions & 6 deletions src/crypto/crypto_sig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,15 @@ bool IsOneShot(const ManagedEVPPKey& key) {
}
}

bool UseP1363Encoding(const SignConfiguration& params) {
switch (EVP_PKEY_id(params.key->GetAsymmetricKey().get())) {
bool UseP1363Encoding(const ManagedEVPPKey& key,
const DSASigEnc& dsa_encoding) {
switch (EVP_PKEY_id(key.get())) {
case EVP_PKEY_EC:
case EVP_PKEY_DSA: return params.dsa_encoding == kSigEncP1363;
case EVP_PKEY_DSA:
return dsa_encoding == kSigEncP1363;
default:
return false;
}
return false;
}
} // namespace

Expand Down Expand Up @@ -773,7 +776,7 @@ Maybe<bool> SignTraits::AdditionalConfig(
// the signature from WebCrypto format into DER format...
ManagedEVPPKey m_pkey = params->key->GetAsymmetricKey();
Mutex::ScopedLock lock(*m_pkey.mutex());
if (UseP1363Encoding(*params)) {
if (UseP1363Encoding(m_pkey, params->dsa_encoding)) {
params->signature =
ConvertFromWebCryptoSignature(m_pkey, signature.ToByteSource());
} else {
Expand Down Expand Up @@ -870,7 +873,7 @@ bool SignTraits::DeriveBits(
if (!EVP_DigestSignFinal(context.get(), data, &len))
return false;

if (UseP1363Encoding(params)) {
if (UseP1363Encoding(m_pkey, params.dsa_encoding)) {
*out = ConvertToWebCryptoSignature(
params.key->GetAsymmetricKey(), buf);
} else {
Expand Down