Egalware/lib3mf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib3mf 2.5 :

Browse Source 
- aggiornamento versione
- utilizzate le nostre librerie esterne libzip e zlib e non quelle incluse in lib3mf.
This commit is contained in:
SaraP
2026-08-25 12:44:11 +02:00
parent ea6efc1e36
commit 513f08e691
544 changed files with 52634 additions and 30760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Common/Platform/NMR_EncryptionHeader.cpp
+16 -3
View File
@@ -8,7 +8,11 @@
#include "Common/Platform/NMR_ExportStream.h"
#include "Common/NMR_Architecture_Utils.h"
#include <cstdint>
#include <cstring>
#define LIB3MF_MAXENCRYPTIONHEADERSIZE (1UL << 31)
namespace NMR {
CEncryptionHeader::CEncryptionHeader(std::vector<nfByte> const & additionalData)
@@ -28,18 +32,27 @@ namespace NMR {
if (header.Header.majorVersion != 0 || header.Header.minorVersion != 0)
throw CNMRException(NMR_ERROR_ENCRYPTEDCONTENTVERSIONUNSUPPORTED);
constexpr size_t headerSize = sizeof(header);
if (header.Header.Length.length < (uint64_t) headerSize)
throw CNMRException(NMR_ERROR_COULDNOTREADENCRYPTEDSTREAM);
if (header.Header.Length.length > LIB3MF_MAXENCRYPTIONHEADERSIZE)
throw CNMRException(NMR_ERROR_COULDNOTREADENCRYPTEDSTREAM);
nfUint32 remainingBytes = header.Header.Length.length - headerSize;
if (remainingBytes > 0) {
m_rgAdditionalData.resize(remainingBytes, 0);
from->readIntoBuffer(m_rgAdditionalData.data(), remainingBytes, true);
}
m_nfHeaderSize = header.Header.Length.length;
return m_nfHeaderSize;
m_nfHeaderSize = (size_t) header.Header.Length.length;
return (size_t) m_nfHeaderSize;
}
size_t CEncryptionHeader::writeTo(PExportStream to) {
uEncryptedFileHeader header = { { '%', '3', 'M', 'c', 'F', 0, 0, 0, 0, 0, 0, 0 } };
constexpr size_t headerSize = sizeof(header);
m_nfHeaderSize = (nfUint32)(headerSize + m_rgAdditionalData.size());
if (m_nfHeaderSize > LIB3MF_MAXENCRYPTIONHEADERSIZE)
throw CNMRException(NMR_ERROR_COULDNOTWRITESTREAM);
header.Header.Length.length = (nfUint32)m_nfHeaderSize;
if (isBigEndian()) {
header.Header.Length.length = swapBytes(header.Header.Length.length);
@@ -47,7 +60,7 @@ namespace NMR {
to->writeBuffer(header.bytes, headerSize);
if (m_rgAdditionalData.size() > 0)
to->writeBuffer(m_rgAdditionalData.data(), m_rgAdditionalData.size());
return m_nfHeaderSize;
return (size_t)m_nfHeaderSize;
}
std::vector<nfByte> const & CEncryptionHeader::additionalData() const {
return m_rgAdditionalData;