diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-01 11:20:18 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-02-07 22:57:27 +0100 |
| commit | 4beb8f34b18d80a2f4b42ebed9ed08b4eaf11403 (patch) | |
| tree | c0f5c7d4f67222b05a88ff76286f0ceb48ffe043 /comphelper | |
| parent | a77fa2be1e0d8c22198a3a45153bb25ecf3135dd (diff) | |
check that rtl_random_getBytes() was successful
... everywhere it is used to generate material for encryption.
Change-Id: Id3390376bb2f3a5fa1bbfd735850fce886ef7db2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162873
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit b85c2459ced6a41915dbaf567613fb5e244a0ada)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162890
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 5 | ||||
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 0adb6eff9a4a..1f73bd8d7026 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -427,7 +427,10 @@ OUString DocPasswordHelper::GetOoxHashAsBase64( uno::Sequence< sal_Int8 > aResult( nLength ); rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_getBytes ( aRandomPool, aResult.getArray(), nLength ); + if (rtl_random_getBytes(aRandomPool, aResult.getArray(), nLength) != rtl_Random_E_None) + { + throw uno::RuntimeException("rtl_random_getBytes failed"); + } rtl_random_destroyPool ( aRandomPool ); return aResult; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 9d3dbcd22732..c190d099ea00 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -446,7 +446,10 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionDat // get 32 random chars out of it uno::Sequence < sal_Int8 > aVector(32); - rtl_random_getBytes( aRandomPool, aVector.getArray(), aVector.getLength() ); + if (rtl_random_getBytes(aRandomPool, aVector.getArray(), aVector.getLength()) != rtl_Random_E_None) + { + throw uno::RuntimeException("rtl_random_getBytes failed"); + } rtl_random_destroyPool(aRandomPool); |