Skip to content

Raise specialized WolfCryptApiError for failed API calls. #110

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

Merged
dgarske merged 3 commits into from
May 8, 2026
Merged

Raise specialized WolfCryptApiError for failed API calls. #110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ac207d
Raise specialized WolfCryptApiError for failed API calls.
roberthdevries Apr 24, 2026
8d80db4
Pass error return value to exception
roberthdevries May 8, 2026
2bcc703
Revert change to raising WolfCryptError
roberthdevries May 8, 2026
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
7 changes: 3 additions & 4 deletions wolfcrypt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,14 @@
if top_level_py not in ["setup.py", "build_ffi.py"]:
from wolfcrypt._ffi import ffi as _ffi
from wolfcrypt._ffi import lib as _lib
from wolfcrypt.exceptions import WolfCryptError
from wolfcrypt.exceptions import WolfCryptApiError

if hasattr(_lib, 'WC_RNG_SEED_CB_ENABLED'):
if _lib.WC_RNG_SEED_CB_ENABLED:
ret = _lib.wc_SetSeed_Cb(_ffi.addressof(_lib, "wc_GenerateSeed"))
if ret < 0:
raise WolfCryptError("wc_SetSeed_Cb failed (%d)" % ret)
raise WolfCryptApiError("wc_SetSeed_Cb failed", ret)
if _lib.FIPS_ENABLED and _lib.FIPS_VERSION >= 5:
ret = _lib.wolfCrypt_SetPrivateKeyReadEnable_fips(1, _lib.WC_KEYTYPE_ALL)
if ret < 0:
raise WolfCryptError("wolfCrypt_SetPrivateKeyReadEnable_fips failed"
" (%d)" % ret)
raise WolfCryptApiError("wolfCrypt_SetPrivateKeyReadEnable_fips failed", ret)
17 changes: 6 additions & 11 deletions wolfcrypt/asn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from wolfcrypt._ffi import ffi as _ffi
from wolfcrypt._ffi import lib as _lib
from wolfcrypt.exceptions import WolfCryptError
from wolfcrypt.exceptions import WolfCryptError, WolfCryptApiError

if _lib.SHA_ENABLED:
from wolfcrypt.hashes import Sha
Expand All @@ -41,8 +41,7 @@ def pem_to_der(pem, pem_type):
ret = _lib.wc_PemToDer(pem, len(pem), pem_type, der, _ffi.NULL,
_ffi.NULL, _ffi.NULL)
if ret != 0:
err = "Error converting from PEM to DER. ({})".format(ret)
raise WolfCryptError(err)
raise WolfCryptApiError("Error converting from PEM to DER.", ret)

try:
result = _ffi.buffer(der[0][0].buffer, der[0][0].length)[:]
Expand All @@ -54,15 +53,13 @@ def der_to_pem(der, pem_type):
pem_length = _lib.wc_DerToPemEx(der, len(der), _ffi.NULL, 0, _ffi.NULL,
pem_type)
if pem_length <= 0:
err = "Error getting required PEM buffer length. ({})".format(pem_length)
raise WolfCryptError(err)
raise WolfCryptApiError("Error getting required PEM buffer length.", pem_length)

pem = _ffi.new("byte[%d]" % pem_length)
pem_length = _lib.wc_DerToPemEx(der, len(der), pem, pem_length,
_ffi.NULL, pem_type)
if pem_length <= 0:
err = "Error converting from DER to PEM. ({})".format(pem_length)
raise WolfCryptError(err)
raise WolfCryptApiError("Error converting from DER to PEM.", pem_length)

return _ffi.buffer(pem, pem_length)[:]

Expand All @@ -76,8 +73,7 @@ def hash_oid_from_class(hash_cls):
elif _lib.SHA512_ENABLED and hash_cls == Sha512:
return _lib.SHA512h
else:
err = "Unknown hash class {}.".format(hash_cls.__name__)
raise WolfCryptError(err)
raise WolfCryptError(f"Unknown hash class {hash_cls.__name__}")

def make_signature(data, hash_cls, key=None):
hash_obj = hash_cls()
Expand All @@ -89,8 +85,7 @@ def make_signature(data, hash_cls, key=None):
plaintext_len = _lib.wc_EncodeSignature(plaintext_sig, digest,
len(digest), hash_oid)
if plaintext_len == 0:
err = "Error calling wc_EncodeSignature. ({})".format(plaintext_len)
raise WolfCryptError(err)
raise WolfCryptError(f"Error calling wc_EncodeSignature. ({plaintext_len})")

plaintext_sig = _ffi.buffer(plaintext_sig, plaintext_len)[:]
if key:
Expand Down
Loading
Loading