Skip to content

Commit

Permalink
closes bpo-38402: Check error of primitive crypt/crypt_r. (GH-16599)
Browse files Browse the repository at this point in the history
Checks also for encryption algorithms methods not supported in different
OSs.

Signed-off-by: Antonio Gutierrez <[email protected]>
  • Loading branch information
chibby0ne authored and benjaminp committed Oct 8, 2019
1 parent 4d5f94b commit 0d3fe8a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
10 changes: 9 additions & 1 deletion Lib/crypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
else:
raise ImportError("The required _crypt module was not built as part of CPython")

import errno
import string as _string
from random import SystemRandom as _SystemRandom
from collections import namedtuple as _namedtuple
Expand Down Expand Up @@ -88,7 +89,14 @@ def _add_method(name, *args, rounds=None):
method = _Method(name, *args)
globals()['METHOD_' + name] = method
salt = mksalt(method, rounds=rounds)
result = crypt('', salt)
result = None
try:
result = crypt('', salt)
except OSError as e:
# Not all libc libraries support all encryption methods.
if e.errno == errno.EINVAL:
return False
raise
if result and len(result) == method.total_size:
methods.append(method)
return True
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check the error from the system's underlying ``crypt`` or ``crypt_r``.
3 changes: 3 additions & 0 deletions Modules/_cryptmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ crypt_crypt_impl(PyObject *module, const char *word, const char *salt)
#else
crypt_result = crypt(word, salt);
#endif
if (crypt_result == NULL) {
return PyErr_SetFromErrno(PyExc_OSError);
}
return Py_BuildValue("s", crypt_result);
}

Expand Down

0 comments on commit 0d3fe8a

Please sign in to comment.