diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-04-08 21:37:23 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-09 09:11:48 +0200 |
| commit | 8a9d8238bd8f903393ff1184aa37f8973c81e2ba (patch) | |
| tree | bdd5830590a7067ebbf9d7a27e589099d80bda37 /xmlsecurity/inc | |
| parent | a39f2e1943c7092dd32bd1f4e480ee6da54a80e4 (diff) | |
tdf#123747 xmlsecurity, ODF sign roundtrip: preserve invalid reference type
Only add the correct type to new signatures to avoid breaking the hash
of old ones.
Change-Id: I30f892b292f84a0575a3d4ef5ccf3eddbe0090ca
Reviewed-on: https://gerrit.libreoffice.org/70424
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmlsecurity/inc')
| -rw-r--r-- | xmlsecurity/inc/xsecctl.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx index d5570a525b67..151de483371d 100644 --- a/xmlsecurity/inc/xsecctl.hxx +++ b/xmlsecurity/inc/xsecctl.hxx @@ -89,10 +89,10 @@ public: xReferenceResolvedListener = xListener; } - void addReference( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri, sal_Int32 keeperId ) + void addReference( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri, sal_Int32 keeperId, const OUString& rType ) { signatureInfor.vSignatureReferenceInfors.push_back( - SignatureReferenceInformation(type, digestID, uri)); + SignatureReferenceInformation(type, digestID, uri, rType)); vKeeperIds.push_back( keeperId ); } }; @@ -260,7 +260,8 @@ private: void switchGpgSignature(); void addReference( const OUString& ouUri, - sal_Int32 nDigestID ); + sal_Int32 nDigestID, + const OUString& ouType ); void addStreamReference( const OUString& ouUri, bool isBinary, |