actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify: read files ourselves

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-20 00:58:09 +00:00
parent b547c631e6
commit 1cc8495a26
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CryptManager.cpp
+9 -13
View File
@@ -126,11 +126,9 @@ void CryptManager::SignFileToFile( CString sPath, CString sSignatureFile )
if( sSignatureFile.empty() ) if( sSignatureFile.empty() )
sSignatureFile = sPath + SIGNATURE_APPEND; sSignatureFile = sPath + SIGNATURE_APPEND;
if( !IsAFile(sPrivFilename) ) CString sPrivKey;
{ if( !GetFileContents(sPrivFilename, sPrivKey) )
LOG->Trace( "SignFileToFile: \"%s\" doesn't exist", sSignatureFile.c_str() );
return; return;
}
if( !IsAFile(sMessageFilename) ) if( !IsAFile(sMessageFilename) )
{ {
@@ -140,7 +138,7 @@ void CryptManager::SignFileToFile( CString sPath, CString sSignatureFile )
CString sSignature; CString sSignature;
try { try {
RageFileSource privFile(sPrivFilename, true); StringSource privFile( sPrivKey, true );
RSASSA_PKCS1v15_SHA_Signer priv(privFile); RSASSA_PKCS1v15_SHA_Signer priv(privFile);
NonblockingRng rng; NonblockingRng rng;
@@ -216,24 +214,22 @@ bool CryptManager::Verify( CString sPath, CString sSignature )
{ {
ASSERT( PREFSMAN->m_bSignProfileData ); ASSERT( PREFSMAN->m_bSignProfileData );
CString sPubFilename = PUBLIC_KEY_PATH; CString sPublicKeyFile = PUBLIC_KEY_PATH;
CString sMessageFilename = sPath; CString sMessageFilename = sPath;
if( !IsAFile(sPubFilename) ) CString sPublicKey;
if( !GetFileContents(sPublicKeyFile, sPublicKey) )
return false; return false;
try { try {
RageFileSource pubFile(sPubFilename, true); StringSource pubFile( sPublicKey, true );
RSASSA_PKCS1v15_SHA_Verifier pub(pubFile); RSASSA_PKCS1v15_SHA_Verifier pub(pubFile);
StringSource signatureFile(sSignature, true); if( sSignature.size() != pub.SignatureLength() )
if (signatureFile.MaxRetrievable() != pub.SignatureLength())
return false; return false;
SecByteBlock signature(pub.SignatureLength());
signatureFile.Get(signature, signature.size());
VerifierFilter *verifierFilter = new VerifierFilter(pub); VerifierFilter *verifierFilter = new VerifierFilter(pub);
verifierFilter->Put(signature, pub.SignatureLength()); verifierFilter->Put( (byte *) sSignature.data(), sSignature.size() );
RageFileSource f(sMessageFilename, true, verifierFilter); RageFileSource f(sMessageFilename, true, verifierFilter);
return verifierFilter->GetLastResult(); return verifierFilter->GetLastResult();