GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — use 'defining_class' when copying HACL*-based hashes · python/cpython@f631476

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Lib/test
- test_hashlib.py
Modules
- blake2module.c
- clinic
  - blake2module.c.h
  - sha3module.c.h
- sha3module.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Lib/test/test_hashlib.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_hashlib.py

+26Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,24 @@ def shake_constructors(self):`
`216`	`216`	`def is_fips_mode(self):`
`217`	`217`	`return get_fips_mode()`
`218`	`218`
	`219`	`+ def match_digest(self, h1, h2, *, shake_size=16):`
	`220`	`+ self.assertIs(type(h1), type(h2))`
	`221`	`+ self.assertEqual(h1.name, h2.name)`
	`222`	`+`
	`223`	`+ if h1.name in self.shakes:`
	`224`	`+ d1, h1 = h1.digest(shake_size), h1.hexdigest(shake_size)`
	`225`	`+ d2, h2 = h2.digest(shake_size), h2.hexdigest(shake_size)`
	`226`	`+ else:`
	`227`	`+ d1, h1 = h1.digest(), h1.hexdigest()`
	`228`	`+ d2, h2 = h2.digest(), h2.hexdigest()`
	`229`	`+`
	`230`	`+ self.assertIsInstance(d1, bytes)`
	`231`	`+ self.assertIsInstance(h1, str)`
	`232`	`+ self.assertEqual(d1.hex(), h1)`
	`233`	`+`
	`234`	`+ self.assertEqual(d1, d2)`
	`235`	`+ self.assertEqual(h1, h2)`
	`236`	`+`
`219`	`237`	`def test_hash_array(self):`
`220`	`238`	`a = array.array("b", range(10))`
`221`	`239`	`for cons in self.hash_constructors:`
`@@ -371,6 +389,14 @@ def test_get_builtin_constructor(self):`
`371`	`389`	`self.assertIs(constructor, _md5.md5)`
`372`	`390`	`self.assertEqual(sorted(builtin_constructor_cache), ['MD5', 'md5'])`
`373`	`391`
	`392`	`+ def test_copy(self):`
	`393`	`+ for cons in self.hash_constructors:`
	`394`	`+ h1 = cons(usedforsecurity=False)`
	`395`	`+ h1.update(os.urandom(16))`
	`396`	`+ h2 = h1.copy()`
	`397`	`+ self.assertIs(type(h1), type(h2))`
	`398`	`+ self.match_digest(h1, h2)`
	`399`	`+`
`374`	`400`	`def test_hexdigest(self):`
`375`	`401`	`for cons in self.hash_constructors:`
`376`	`402`	`h = cons(usedforsecurity=False)`

Collapse file

`‎Modules/blake2module.c‎`

Copy file name to clipboardExpand all lines: Modules/blake2module.c

+5-3Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -787,17 +787,19 @@ blake2_blake2b_copy_unlocked(Blake2Object self, Blake2Object cpy)`
`787`	`787`	`/*[clinic input]`
`788`	`788`	`_blake2.blake2b.copy`
`789`	`789`
	`790`	`+ cls: defining_class`
	`791`	`+`
`790`	`792`	`Return a copy of the hash object.`
`791`	`793`	`[clinic start generated code]*/`
`792`	`794`
`793`	`795`	`static PyObject *`
`794`		`-_blake2_blake2b_copy_impl(Blake2Object *self)`
`795`		`-/[clinic end generated code: output=622d1c56b91c50d8 input=e383c2d199fd8a2e]/`
	`796`	`+_blake2_blake2b_copy_impl(Blake2Object self, PyTypeObject cls)`
	`797`	`+/[clinic end generated code: output=5f8ea31c56c52287 input=f38f3475e9aec98d]/`
`796`	`798`	`{`
`797`	`799`	`int rc;`
`798`	`800`	`Blake2Object *cpy;`
`799`	`801`
`800`		`- if ((cpy = new_Blake2Object(Py_TYPE(self))) == NULL) {`
	`802`	`+ if ((cpy = new_Blake2Object(cls)) == NULL) {`
`801`	`803`	`return NULL;`
`802`	`804`	`}`
`803`	`805`

Collapse file

`‎Modules/clinic/blake2module.c.h‎`

Copy file name to clipboardExpand all lines: Modules/clinic/blake2module.c.h

+9-5Lines changed: 9 additions & 5 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

`‎Modules/clinic/sha3module.c.h‎`

Copy file name to clipboardExpand all lines: Modules/clinic/sha3module.c.h

+9-5Lines changed: 9 additions & 5 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

`‎Modules/sha3module.c‎`

Copy file name to clipboardExpand all lines: Modules/sha3module.c

+5-4Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,16 +239,17 @@ SHA3_traverse(PyObject self, visitproc visit, void arg)`
`239`	`239`	`/*[clinic input]`
`240`	`240`	`_sha3.sha3_224.copy`
`241`	`241`
	`242`	`+ cls: defining_class`
	`243`	`+`
`242`	`244`	`Return a copy of the hash object.`
`243`	`245`	`[clinic start generated code]*/`
`244`	`246`
`245`	`247`	`static PyObject *`
`246`		`-_sha3_sha3_224_copy_impl(SHA3object *self)`
`247`		`-/[clinic end generated code: output=6c537411ecdcda4c input=93a44aaebea51ba8]/`
	`248`	`+_sha3_sha3_224_copy_impl(SHA3object self, PyTypeObject cls)`
	`249`	`+/[clinic end generated code: output=13958b44c244013e input=7134b4dc0a2fbcac]/`
`248`	`250`	`{`
`249`	`251`	`SHA3object *newobj;`
`250`		`-`
`251`		`- if ((newobj = newSHA3object(Py_TYPE(self))) == NULL) {`
	`252`	`+ if ((newobj = newSHA3object(cls)) == NULL) {`
`252`	`253`	`return NULL;`
`253`	`254`	`}`
`254`	`255`	`HASHLIB_ACQUIRE_LOCK(self);`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.