Kaydet (Commit) 0423db15 authored tarafından Eike Rathke's avatar Eike Rathke

Add ScTableProtectionImpl::setPasswordHash() for OOXML, tdf#104250 prep

Change-Id: I9589f750cf2f69f4b725cd351aa9ef3749190431
üst c6eb3bf5
...@@ -88,6 +88,8 @@ public: ...@@ -88,6 +88,8 @@ public:
virtual void setPasswordHash( virtual void setPasswordHash(
const css::uno::Sequence<sal_Int8>& aPassword, const css::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0; ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0;
virtual void setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount ) = 0;
virtual bool verifyPassword(const OUString& aPassText) const = 0; virtual bool verifyPassword(const OUString& aPassText) const = 0;
}; };
...@@ -117,6 +119,8 @@ public: ...@@ -117,6 +119,8 @@ public:
virtual void setPasswordHash( virtual void setPasswordHash(
const css::uno::Sequence<sal_Int8>& aPassword, const css::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override;
virtual void setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount ) override;
virtual bool verifyPassword(const OUString& aPassText) const override; virtual bool verifyPassword(const OUString& aPassText) const override;
bool isOptionEnabled(Option eOption) const; bool isOptionEnabled(Option eOption) const;
...@@ -198,6 +202,8 @@ public: ...@@ -198,6 +202,8 @@ public:
virtual void setPasswordHash( virtual void setPasswordHash(
const css::uno::Sequence<sal_Int8>& aPassword, const css::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override;
virtual void setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount ) override;
virtual bool verifyPassword(const OUString& aPassText) const override; virtual bool verifyPassword(const OUString& aPassText) const override;
bool isOptionEnabled(Option eOption) const; bool isOptionEnabled(Option eOption) const;
......
...@@ -127,6 +127,8 @@ public: ...@@ -127,6 +127,8 @@ public:
void setPasswordHash( void setPasswordHash(
const css::uno::Sequence<sal_Int8>& aPassword, const css::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash, ScPasswordHash eHash2); ScPasswordHash eHash, ScPasswordHash eHash2);
void setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount );
bool verifyPassword(const OUString& aPassText) const; bool verifyPassword(const OUString& aPassText) const;
bool isOptionEnabled(SCSIZE nOptId) const; bool isOptionEnabled(SCSIZE nOptId) const;
...@@ -325,6 +327,15 @@ void ScTableProtectionImpl::setPasswordHash( ...@@ -325,6 +327,15 @@ void ScTableProtectionImpl::setPasswordHash(
#endif #endif
} }
void ScTableProtectionImpl::setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount )
{
maPasswordHash.maAlgorithmName = rAlgorithmName;
maPasswordHash.maHashValue = rHashValue;
maPasswordHash.maSaltValue = rSaltValue;
maPasswordHash.mnSpinCount = nSpinCount;
}
bool ScTableProtectionImpl::verifyPassword(const OUString& aPassText) const bool ScTableProtectionImpl::verifyPassword(const OUString& aPassText) const
{ {
#if DEBUG_TAB_PROTECTION #if DEBUG_TAB_PROTECTION
...@@ -562,6 +573,12 @@ void ScDocProtection::setPasswordHash( ...@@ -562,6 +573,12 @@ void ScDocProtection::setPasswordHash(
mpImpl->setPasswordHash(aPassword, eHash, eHash2); mpImpl->setPasswordHash(aPassword, eHash, eHash2);
} }
void ScDocProtection::setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount )
{
mpImpl->setPasswordHash( rAlgorithmName, rHashValue, rSaltValue, nSpinCount);
}
bool ScDocProtection::verifyPassword(const OUString& aPassText) const bool ScDocProtection::verifyPassword(const OUString& aPassText) const
{ {
return mpImpl->verifyPassword(aPassText); return mpImpl->verifyPassword(aPassText);
...@@ -636,6 +653,12 @@ void ScTableProtection::setPasswordHash( ...@@ -636,6 +653,12 @@ void ScTableProtection::setPasswordHash(
mpImpl->setPasswordHash(aPassword, eHash, eHash2); mpImpl->setPasswordHash(aPassword, eHash, eHash2);
} }
void ScTableProtection::setPasswordHash( const OUString& rAlgorithmName, const OUString& rHashValue,
const OUString& rSaltValue, sal_uInt32 nSpinCount )
{
mpImpl->setPasswordHash( rAlgorithmName, rHashValue, rSaltValue, nSpinCount);
}
bool ScTableProtection::verifyPassword(const OUString& aPassText) const bool ScTableProtection::verifyPassword(const OUString& aPassText) const
{ {
return mpImpl->verifyPassword(aPassText); return mpImpl->verifyPassword(aPassText);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment