Skip to content

Handle missing OpenSSL reasons #208

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
merged 7 commits into from
Apr 11, 2015
Merged

Handle missing OpenSSL reasons #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a268f6c
Handle when an OpenSSL error doesn't contain a reason
alex Aug 12, 2014
de1906a
Added a test case
alex Aug 12, 2014
bae2dc3
Fix for py3k
alex Aug 14, 2014
9823239
A docstring for the test
alex Aug 15, 2014
27f55ed
Fixed a typo in the test method name
alex Aug 15, 2014
6d86218
merge alex/aint-no-reason-things-are-this-way
exarkun Apr 11, 2015
174c692
minor docstring fixes
exarkun Apr 11, 2015
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
2 changes: 2 additions & 0 deletions OpenSSL/_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ def text(charp):

:return: :class:`str`
"""
if not charp:
return ""
return native(ffi.string(charp))


Expand Down
17 changes: 17 additions & 0 deletions OpenSSL/test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from OpenSSL._util import exception_from_error_queue, lib
from OpenSSL.test.util import TestCase



class ErrorTests(TestCase):
"""
Tests for handling of certain OpenSSL error cases.
"""
def test_exception_from_error_queue_nonexistent_reason(self):
"""
:py:func:`exception_from_error_queue` raises ``ValueError`` when it
encounters an OpenSSL error code which does not have a reason string.
"""
lib.ERR_put_error(lib.ERR_LIB_EVP, 0, 1112, b"", 10)
exc = self.assertRaises(ValueError, exception_from_error_queue, ValueError)
self.assertEqual(exc.args[0][0][2], "")