Commit2d5e503

authored

Merge pull request#29608 from martinky24/bugfix/29603/md5-fips

Remove md5 usage to prevent issues on FIPS enabled systems (closes#29603)

2 parents8465b0f +938ad62 commit2d5e503Copy full SHA for 2d5e503

File tree

+13

-9

lines changed

+13

-9

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,10 @@ def latex2html(node, source):`
`146`	`146`	`fontset=node['fontset']`
`147`	`147`	`fontsize=node['fontsize']`
`148`	`148`	`name='math-{}'.format(`
`149`		`-hashlib.md5(f'{latex}{fontset}{fontsize}'.encode()).hexdigest()[-10:])`
	`149`	`+hashlib.sha256(`
	`150`	`+f'{latex}{fontset}{fontsize}'.encode(),`
	`151`	`+usedforsecurity=False,`
	`152`	`+ ).hexdigest()[-10:])`
`150`	`153`
`151`	`154`	`destdir=Path(setup.app.builder.outdir,'_images','mathmpl')`
`152`	`155`	`destdir.mkdir(parents=True,exist_ok=True)`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,22 +46,20 @@ def get_cache_dir():`
`46`	`46`
`47`	`47`
`48`	`48`	`defget_file_hash(path,block_size=2**20):`
`49`		`-md5=hashlib.md5()`
	`49`	`+sha256=hashlib.sha256(usedforsecurity=False)`
`50`	`50`	`withopen(path,'rb')asfd:`
`51`	`51`	`whileTrue:`
`52`	`52`	`data=fd.read(block_size)`
`53`	`53`	`ifnotdata:`
`54`	`54`	`break`
`55`		`-md5.update(data)`
	`55`	`+sha256.update(data)`
`56`	`56`
`57`	`57`	`ifPath(path).suffix=='.pdf':`
`58`		`-md5.update(str(mpl._get_executable_info("gs").version)`
`59`		`- .encode('utf-8'))`
	`58`	`+sha256.update(str(mpl._get_executable_info("gs").version).encode('utf-8'))`
`60`	`59`	`elifPath(path).suffix=='.svg':`
`61`		`-md5.update(str(mpl._get_executable_info("inkscape").version)`
`62`		`- .encode('utf-8'))`
	`60`	`+sha256.update(str(mpl._get_executable_info("inkscape").version).encode('utf-8'))`
`63`	`61`
`64`		`-returnmd5.hexdigest()`
	`62`	`+returnsha256.hexdigest()`
`65`	`63`
`66`	`64`
`67`	`65`	`class_ConverterError(Exception):`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,10 @@ def get_basefile(cls, tex, fontsize, dpi=None):`
`168`	`168`	`Return a filename based on a hash of the string, fontsize, and dpi.`
`169`	`169`	`"""`
`170`	`170`	`src=cls._get_tex_source(tex,fontsize)+str(dpi)`
`171`		`-filehash=hashlib.md5(src.encode('utf-8')).hexdigest()`
	`171`	`+filehash=hashlib.sha256(`
	`172`	`+src.encode('utf-8'),`
	`173`	`+usedforsecurity=False`
	`174`	`+ ).hexdigest()`
`172`	`175`	`filepath=Path(cls._texcache)`
`173`	`176`
`174`	`177`	`num_letters,num_levels=2,2`

Comments

(0)