Mailman 3 August 2004 - Python-checkins

python/dist/src/Lib random.py,1.63,1.64
by rhettinger＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2754 Modified Files: random.py Log Message: Take advantage of the math library's ldexp for assembling a float by components without division and without roundoff error for properly sized mantissas (i.e. on systems with 53 or more mantissa bits per float). Eliminates the previous implementation's rounding bias as aptly demonstrated by Tim Peters. Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- random.py 30 Aug 2004 06:14:28 -0000 1.63 +++ random.py 31 Aug 2004 01:05:15 -0000 1.64 @@ -43,7 +43,7 @@ from types import MethodType as _MethodType, BuiltinMethodType as _BuiltinMethodType from math import log as _log, exp as _exp, pi as _pi, e as _e from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin -from math import floor as _floor +from math import floor as _floor, ldexp as _ldexp __all__ = ["Random","seed","random","uniform","randint","choice","sample", "randrange","shuffle","normalvariate","lognormvariate", @@ -63,13 +63,11 @@ from binascii import hexlify as _hexlify except ImportError: _urandom = None -else: - _tofloat = 2.0 ** (-7*8) # converts 7 byte integers to floats # Translated by Guido van Rossum from C source provided by # Adrian Baddeley. Adapted by Raymond Hettinger for use with -# the Mersenne Twister core generator. +# the Mersenne Twister and os.urandom() core generators. import _random @@ -761,7 +759,7 @@ """Get the next random number in the range [0.0, 1.0).""" if _urandom is None: raise NotImplementedError('Cannot find hardware entropy source') - return long(_hexlify(_urandom(7)), 16) * _tofloat + return _ldexp(long(_hexlify(_urandom(7)), 16) >> 3, -BPF) def getrandbits(self, k): """getrandbits(k) -> x. Generates a long int with k random bits."""

1 0

python/dist/src/Misc NEWS,1.1119,1.1120
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27357/Misc Modified Files: NEWS Log Message: SF patch 936813: fast modular exponentiation This checkin is adapted from part 2 (of 3) of Trevor Perrin's patch set. BACKWARD INCOMPATIBILITY: SHIFT must now be divisible by 5. AFAIK, nobody will care. long_pow() could be complicated to worm around that, if necessary. long_pow(): - BUGFIX: This leaked the base and power when the power was negative (and so the computation delegated to float pow). - Instead of doing right-to-left exponentiation, do left-to-right. This is more efficient for small bases, which is the common case. - In addition, if the exponent is large (more than FIVEARY_CUTOFF digits), precompute [a**i % c for i in range(32)], and go left to right 5 bits at a time. l_divmod(): - The signature changed so that callers who don't want the quotient, or don't want the remainder, can pass NULL in the slot they don't want. This saves them from having to declare a vrbl for unwanted stuff, and remembering to decref it. long_mod(), long_div(), long_classic_div(): - Adjust to new l_divmod() signature, and simplified as a result. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1119 retrieving revision 1.1120 diff -u -d -r1.1119 -r1.1120 --- NEWS 29 Aug 2004 22:16:49 -0000 1.1119 +++ NEWS 30 Aug 2004 02:44:37 -0000 1.1120 @@ -20,7 +20,11 @@ to compute 17**1000000 dropped from about 14 seconds to 9 on my box due to this much. The cutoff for Karatsuba multiplication was raised, since gradeschool multiplication got quicker, and the cutoff was - aggressively small regardless. + aggressively small regardless. The exponentiation algorithm was switched + from right-to-left to left-to-right, which is more efficient for small + bases. In addition, if the exponent is large, the algorithm now does + 5 bits (instead of 1 bit) at a time. That cut the time to compute + 17**1000000 on my box in half again, down to about 4.5 seconds. - OverflowWarning is no longer generated. PEP 237 scheduled this to occur in Python 2.3, but since OverflowWarning was disabled by default, @@ -156,6 +160,14 @@ Build ----- +- Backward incompatibility: longintrepr.h now triggers a compile-time + error if SHIFT (the number of bits in a Python long "digit") isn't + divisible by 5. This new requirement allows simple code for the new + 5-bits-at-a-time long_pow() implementation. If necessary, the + restriction could be removed (by complicating long_pow(), or by + falling back to the 1-bit-at-a-time algorithm), but there are no + plans to do so. + - bug #991962: When building with --disable-toolbox-glue on Darwin no attempt to build Mac-specific modules occurs.

3 2

python/dist/src/Lib/test test_long.py,1.23,1.24
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19211/Lib/test Modified Files: test_long.py Log Message: Changed Karatsuba cutoff to match current reality. Index: test_long.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_long.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- test_long.py 3 Feb 2003 15:25:01 -0000 1.23 +++ test_long.py 30 Aug 2004 23:18:23 -0000 1.24 @@ -6,7 +6,7 @@ SHIFT = 15 BASE = 2 ** SHIFT MASK = BASE - 1 -KARATSUBA_CUTOFF = 35 # from longobject.c +KARATSUBA_CUTOFF = 70 # from longobject.c # Max number of base BASE digits to use in test cases. Doubling # this will more than double the runtime.

1 0

python/dist/src/PCbuild rt.bat,1.11,1.12
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7133/PCbuild Modified Files: rt.bat Log Message: More cmd.exe exploitation. Index: rt.bat =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/rt.bat,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- rt.bat 30 Aug 2004 21:27:55 -0000 1.11 +++ rt.bat 30 Aug 2004 22:13:22 -0000 1.12 @@ -1,40 +1,52 @@ -@rem Run Tests. Run the regression test suite. -@rem Usage: rt [-d] [-O] [-q] regrtest_args -@rem -d Run Debug build (python_d.exe). Else release build. -@rem -O Run python.exe or python_d.exe (see -d) with -O. -@rem -q "quick" -- normally the tests are run twice, the first time -@rem after deleting all the .py[co] files reachable from Lib/. -@rem -q runs the tests just once, and without deleting .py[co] files. -@rem All leading instances of these switches are shifted off, and -@rem whatever remains is passed to regrtest.py. For example, -@rem rt -O -d -x test_thread -@rem runs -@rem python_d -O ../lib/test/regrtest.py -x test_thread -@rem twice, and -@rem rt -q -g test_binascii -@rem runs -@rem python_d ../lib/test/regrtest.py -g test_binascii -@rem to generate the expected-output file for binascii quickly. -@setlocal -@set _exe=python -@set _qmode=no -@set _dashO= -@PATH %PATH%;..\..\tcltk\bin -@goto CheckOpts -:Again -@shift +@echo off +rem Run Tests. Run the regression test suite. +rem Usage: rt [-d] [-O] [-q] regrtest_args +rem -d Run Debug build (python_d.exe). Else release build. +rem -O Run python.exe or python_d.exe (see -d) with -O. +rem -q "quick" -- normally the tests are run twice, the first time +rem after deleting all the .py[co] files reachable from Lib/. +rem -q runs the tests just once, and without deleting .py[co] files. +rem All leading instances of these switches are shifted off, and +rem whatever remains is passed to regrtest.py. For example, +rem rt -O -d -x test_thread +rem runs +rem python_d -O ../lib/test/regrtest.py -x test_thread +rem twice, and +rem rt -q -g test_binascii +rem runs +rem python_d ../lib/test/regrtest.py -g test_binascii +rem to generate the expected-output file for binascii quickly. +rem +rem Confusing: if you want to pass a comma-separated list, like +rem -u network,largefile +rem then you have to quote it on the rt line, like +rem rt -u "network,largefile" + +setlocal + +set exe=python +set qmode= +set dashO= +PATH %PATH%;..\..\tcltk\bin + :CheckOpts -@if "%1"=="-O" set _dashO=-O -@if "%1"=="-O" goto Again -@if "%1"=="-q" set _qmode=yes -@if "%1"=="-q" goto Again -@if "%1"=="-d" set _exe=python_d -@if "%1"=="-d" goto Again -@if "%_qmode%"=="yes" goto Qmode -@echo Deleting .pyc/.pyo files ... -@%_exe% rmpyc.py -%_exe% %_dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 -@echo About to run again without deleting .pyc/.pyo first: -@pause +if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts +if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts +if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts + +set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 +if defined qmode goto Qmode + +echo Deleting .pyc/.pyo files ... +%exe% rmpyc.py + +echo on +%cmd% +@echo off + +echo About to run again without deleting .pyc/.pyo first: +pause + :Qmode -%_exe% %_dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 +echo on +%cmd%

1 0

python/dist/src/PCbuild rt.bat,1.10,1.11
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30717/PCbuild Modified Files: rt.bat Log Message: Since it's impossible to build Python using VC7.1 on a command.com system, exploit cmd.exe's setlocal function in this directory. Index: rt.bat =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/rt.bat,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- rt.bat 30 Aug 2004 21:14:51 -0000 1.10 +++ rt.bat 30 Aug 2004 21:27:55 -0000 1.11 @@ -15,10 +15,10 @@ @rem runs @rem python_d ../lib/test/regrtest.py -g test_binascii @rem to generate the expected-output file for binascii quickly. +@setlocal @set _exe=python @set _qmode=no @set _dashO= -@set _oldpath=%PATH% @PATH %PATH%;..\..\tcltk\bin @goto CheckOpts :Again @@ -38,8 +38,3 @@ @pause :Qmode %_exe% %_dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 -@set _exe= -@set _qmode= -@set _dashO= -@PATH %_oldpath% -@set _oldpath=

1 0

python/dist/src/PCbuild readme.txt, 1.56, 1.57 rt.bat, 1.9, 1.10
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27749/PCbuild Modified Files: readme.txt rt.bat Log Message: Updated test-runner .bat for new location of Tcl/Tk. Replaced outcomes from native Tcl/Tk tests. Maybe the diffs are legit, maybe not. I noticed that the Tcl results I'm replacing here claimed both that there were no failures, and that one file had tests with failures, so I wasn't inclined to trust them <wink>. Index: readme.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- readme.txt 30 Aug 2004 09:22:04 -0000 1.56 +++ readme.txt 30 Aug 2004 21:14:51 -0000 1.57 @@ -93,9 +93,8 @@ nmake -f makefile.vc test On WinXP Pro, wholly up to date as of 30-Aug-2004: - all.tcl: Total 10572 Passed 9869 Skipped 703 Failed 0 + all.tcl: Total 10678 Passed 9969 Skipped 709 Failed 0 Sourced 129 Test Files. - Files with failing tests: ioCmd.test Build Tk -------- @@ -112,10 +111,9 @@ nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 test On WinXP Pro, wholly up to date as of 30-Aug-2004: - all.tcl: Total 8421 Passed 6826 Skipped 1581 Failed 14 + all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13 Sourced 91 Test Files. - Files with failing tests: frame.test scrollbar.test textWind.test winDialog.test - winWm.test winfo.test + Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test zlib Python wrapper for the zlib compression library. Get the source code @@ -282,13 +280,13 @@ Building for Itanium -------------------- -The project files support a ReleaseItanium configuration which creates +The project files support a ReleaseItanium configuration which creates Win64/Itanium binaries. For this to work, you need to install the Platform SDK, in particular the 64-bit support. This includes an Itanium compiler (future releases of the SDK likely include an AMD64 compiler as well). In addition, you need the Visual Studio plugin for external C compilers, from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to -locate the proper target compiler, and convert compiler options +locate the proper target compiler, and convert compiler options accordingly. The Itanium build has seen little testing. The SDK compiler reports a lot Index: rt.bat =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/rt.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- rt.bat 17 Jul 2004 23:44:32 -0000 1.9 +++ rt.bat 30 Aug 2004 21:14:51 -0000 1.10 @@ -19,7 +19,7 @@ @set _qmode=no @set _dashO= @set _oldpath=%PATH% -@PATH %PATH%;..\..\tcl84\bin +@PATH %PATH%;..\..\tcltk\bin @goto CheckOpts :Again @shift

1 0

python/dist/src/Modules posixmodule.c, 2.325, 2.326
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13542/Modules Modified Files: posixmodule.c Log Message: win32_urandom(): There's no need to copy the generated byte string, so don't. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.325 retrieving revision 2.326 diff -u -d -r2.325 -r2.326 --- posixmodule.c 30 Aug 2004 17:10:53 -0000 2.325 +++ posixmodule.c 30 Aug 2004 17:36:46 -0000 2.326 @@ -7239,9 +7239,8 @@ static PyObject* win32_urandom(PyObject *self, PyObject *args) { - int howMany = 0; - unsigned char* bytes = NULL; - PyObject* returnVal = NULL; + int howMany; + PyObject* result; /* Read arguments */ if (! PyArg_ParseTuple(args, "i:urandom", &howMany)) @@ -7282,21 +7281,16 @@ } /* Allocate bytes */ - bytes = (unsigned char*)PyMem_Malloc(howMany); - if (bytes == NULL) - return PyErr_NoMemory(); - - /* Get random data */ - if (! pCryptGenRandom(hCryptProv, howMany, bytes)) { - PyMem_Free(bytes); - return win32_error("CryptGenRandom", NULL); + result = PyString_FromStringAndSize(NULL, howMany); + if (result != NULL) { + /* Get random data */ + if (! pCryptGenRandom(hCryptProv, howMany, (unsigned char*) + PyString_AS_STRING(result))) { + Py_DECREF(result); + return win32_error("CryptGenRandom", NULL); + } } - - /* Build return value */ - returnVal = PyString_FromStringAndSize(bytes, howMany); - PyMem_Free(bytes); - - return returnVal; + return result; } #endif

1 0

python/dist/src/Modules posixmodule.c, 2.324, 2.325
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8273/Modules Modified Files: posixmodule.c Log Message: win32_urandom(): pass the function name to PyArg_ParseTuple, for better error msgs. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.324 retrieving revision 2.325 diff -u -d -r2.324 -r2.325 --- posixmodule.c 30 Aug 2004 17:08:02 -0000 2.324 +++ posixmodule.c 30 Aug 2004 17:10:53 -0000 2.325 @@ -7244,7 +7244,7 @@ PyObject* returnVal = NULL; /* Read arguments */ - if (! PyArg_ParseTuple(args, "i", &howMany)) + if (! PyArg_ParseTuple(args, "i:urandom", &howMany)) return NULL; if (howMany < 0) return PyErr_Format(PyExc_ValueError,

1 0

python/dist/src/Modules posixmodule.c, 2.323, 2.324
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7723/Modules Modified Files: posixmodule.c Log Message: win32_urandom(): Raise ValueError if the argument is negative. Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.323 retrieving revision 2.324 diff -u -d -r2.323 -r2.324 --- posixmodule.c 30 Aug 2004 17:02:04 -0000 2.323 +++ posixmodule.c 30 Aug 2004 17:08:02 -0000 2.324 @@ -7246,6 +7246,9 @@ /* Read arguments */ if (! PyArg_ParseTuple(args, "i", &howMany)) return NULL; + if (howMany < 0) + return PyErr_Format(PyExc_ValueError, + "negative argument not allowed"); if (hCryptProv == 0) { HINSTANCE hAdvAPI32 = NULL;

1 0

python/dist/src/Modules posixmodule.c, 2.322, 2.323
by tim_one＠users.sourceforge.net Aug. 30, 2004

Aug. 30, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6665/Modules Modified Files: posixmodule.c Log Message: win32_urandom(): Rewrite to Python C standards (hard tabs, function name in first column, no parens around return value). Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.322 retrieving revision 2.323 diff -u -d -r2.322 -r2.323 --- posixmodule.c 29 Aug 2004 15:46:35 -0000 2.322 +++ posixmodule.c 30 Aug 2004 17:02:04 -0000 2.323 @@ -903,7 +903,7 @@ #define ISSLASHW(c) ((c) == L'\\' || (c) == L'/') #define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0])) -static BOOL +static BOOL IsUNCRootA(char *path, int pathlen) { #define ISSLASH ISSLASHA @@ -927,7 +927,7 @@ } #ifdef Py_WIN_WIDE_FILENAMES -static BOOL +static BOOL IsUNCRootW(Py_UNICODE *path, int pathlen) { #define ISSLASH ISSLASHW @@ -994,7 +994,7 @@ if (pathlen > 0) { if (ISSLASHW(wpath[pathlen-1])) { /* It does end with a slash -- exempt the root drive cases. */ - if (pathlen == 1 || (pathlen == 3 && wpath[1] == L':') || + if (pathlen == 1 || (pathlen == 3 && wpath[1] == L':') || IsUNCRootW(wpath, pathlen)) /* leave it alone */; else { @@ -1002,7 +1002,7 @@ wpath[pathlen-1] = L'\0'; } } - else if (ISSLASHW(wpath[1]) && pathlen < ARRAYSIZE(wpath)-1 && + else if (ISSLASHW(wpath[1]) && pathlen < ARRAYSIZE(wpath)-1 && IsUNCRootW(wpath, pathlen)) { /* UNC root w/o trailing slash: add one when there's room */ wpath[pathlen++] = L'\\'; @@ -1044,7 +1044,7 @@ if (pathlen > 0) { if (ISSLASHA(path[pathlen-1])) { /* It does end with a slash -- exempt the root drive cases. */ - if (pathlen == 1 || (pathlen == 3 && path[1] == ':') || + if (pathlen == 1 || (pathlen == 3 && path[1] == ':') || IsUNCRootA(path, pathlen)) /* leave it alone */; else { @@ -1054,7 +1054,7 @@ path = pathcopy; } } - else if (ISSLASHA(path[1]) && pathlen < ARRAYSIZE(pathcopy)-1 && + else if (ISSLASHA(path[1]) && pathlen < ARRAYSIZE(pathcopy)-1 && IsUNCRootA(path, pathlen)) { /* UNC root w/o trailing slash: add one when there's room */ strncpy(pathcopy, path, pathlen); @@ -2079,8 +2079,8 @@ Py_BEGIN_ALLOW_THREADS #ifdef Py_WIN_WIDE_FILENAMES if (have_unicode_filename) - /* utime is OK with utimbuf, but _wutime insists - on _utimbuf (the msvc headers assert the + /* utime is OK with utimbuf, but _wutime insists + on _utimbuf (the msvc headers assert the underscore version is ansi) */ res = _wutime(wpath, (struct _utimbuf *)UTIME_ARG); else @@ -7236,57 +7236,64 @@ static CRYPTGENRANDOM pCryptGenRandom = NULL; static HCRYPTPROV hCryptProv = 0; -static PyObject* win32_urandom(PyObject *self, PyObject *args) +static PyObject* +win32_urandom(PyObject *self, PyObject *args) { - int howMany = 0; - unsigned char* bytes = NULL; - PyObject* returnVal = NULL; + int howMany = 0; + unsigned char* bytes = NULL; + PyObject* returnVal = NULL; - /* Read arguments */ - if (!PyArg_ParseTuple(args, "i", &howMany)) - return(NULL); + /* Read arguments */ + if (! PyArg_ParseTuple(args, "i", &howMany)) + return NULL; - if (hCryptProv == 0) { - HINSTANCE hAdvAPI32 = NULL; - CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL; + if (hCryptProv == 0) { + HINSTANCE hAdvAPI32 = NULL; + CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL; - /* Obtain handle to the DLL containing CryptoAPI - This should not fail */ - if( (hAdvAPI32 = GetModuleHandle("advapi32.dll")) == NULL) - return win32_error("GetModuleHandle", NULL); + /* Obtain handle to the DLL containing CryptoAPI + This should not fail */ + hAdvAPI32 = GetModuleHandle("advapi32.dll"); + if(hAdvAPI32 == NULL) + return win32_error("GetModuleHandle", NULL); - /* Obtain pointers to the CryptoAPI functions - This will fail on some early versions of Win95 */ - pCryptAcquireContext=(CRYPTACQUIRECONTEXTA)GetProcAddress(hAdvAPI32,\ - "CryptAcquireContextA"); - pCryptGenRandom=(CRYPTGENRANDOM)GetProcAddress(hAdvAPI32,\ - "CryptGenRandom"); + /* Obtain pointers to the CryptoAPI functions + This will fail on some early versions of Win95 */ + pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress( + hAdvAPI32, + "CryptAcquireContextA"); + if (pCryptAcquireContext == NULL) + return PyErr_Format(PyExc_NotImplementedError, + "CryptAcquireContextA not found"); - if (pCryptAcquireContext == NULL || pCryptGenRandom == NULL) - return PyErr_Format(PyExc_NotImplementedError,\ - "CryptGenRandom not found"); + pCryptGenRandom = (CRYPTGENRANDOM)GetProcAddress( + hAdvAPI32, "CryptGenRandom"); + if (pCryptAcquireContext == NULL) + return PyErr_Format(PyExc_NotImplementedError, + "CryptGenRandom not found"); - /* Acquire context */ - if(!pCryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT)) - return win32_error("CryptAcquireContext", NULL); - } + /* Acquire context */ + if (! pCryptAcquireContext(&hCryptProv, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + return win32_error("CryptAcquireContext", NULL); + } - /* Allocate bytes */ - if ((bytes = (unsigned char*)PyMem_Malloc(howMany)) == NULL) - return PyErr_NoMemory(); + /* Allocate bytes */ + bytes = (unsigned char*)PyMem_Malloc(howMany); + if (bytes == NULL) + return PyErr_NoMemory(); - /* Get random data */ - if (!pCryptGenRandom(hCryptProv, howMany, bytes)) { - PyMem_Free(bytes); - return win32_error("CryptGenRandom", NULL); - } + /* Get random data */ + if (! pCryptGenRandom(hCryptProv, howMany, bytes)) { + PyMem_Free(bytes); + return win32_error("CryptGenRandom", NULL); + } - /* Build return value */ - returnVal = PyString_FromStringAndSize(bytes, howMany); - PyMem_Free(bytes); + /* Build return value */ + returnVal = PyString_FromStringAndSize(bytes, howMany); + PyMem_Free(bytes); - return returnVal; + return returnVal; } #endif

1 0