mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 07:07:05 +02:00
Code Issues Releases Wiki Activity

Remove nonce bits for now

Browse Source
This commit is contained in:
Jeff Mitchell
2014-03-01 08:27:52 -05:00
parent 6954e942f8
commit f931c1d9a8
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/accounts/hatchet/sip/HatchetSip.cpp
View File

@@ -189,15 +189,8 @@ HatchetSipPlugin::webSocketConnected()
hatchetAccount()->setConnectionState( Tomahawk::Accounts::Account::Connected ); hatchetAccount()->setConnectionState( Tomahawk::Accounts::Account::Connected );
m_sipState = AcquiringVersion; m_sipState = AcquiringVersion;
m_uuid = QUuid::createUuid().toString();
QCA::SecureArray sa( m_uuid.toLatin1() );
QCA::SecureArray result = m_publicKey->encrypt( sa, QCA::EME_PKCS1_OAEP );
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "uuid:" << m_uuid << ", size of uuid:" << m_uuid.size() << ", size of sa:" << sa.size() << ", size of result:" << result.size();
QVariantMap nonceVerMap; QVariantMap nonceVerMap;
nonceVerMap[ "version" ] = VERSION; nonceVerMap[ "version" ] = VERSION;
nonceVerMap[ "nonce" ] = QString( result.toByteArray().toBase64() );
sendBytes( nonceVerMap ); sendBytes( nonceVerMap );
} }
@@ -275,10 +268,10 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg )
if ( m_sipState == AcquiringVersion ) if ( m_sipState == AcquiringVersion )
{ {
tLog() << Q_FUNC_INFO << "In acquiring version state, expecting version/nonce information"; tLog() << Q_FUNC_INFO << "In acquiring version state, expecting version information";
if ( !retMap.contains( "version" ) || !retMap.contains( "nonce" ) ) if ( !retMap.contains( "version" ) )
{ {
tLog() << Q_FUNC_INFO << "Failed to acquire version or nonce information"; tLog() << Q_FUNC_INFO << "Failed to acquire version information";
disconnectPlugin(); disconnectPlugin();
return; return;
} }
@@ -291,13 +284,6 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg )
return; return;
} }
if ( retMap[ "nonce" ].toString() != m_uuid )
{
tLog() << Q_FUNC_INFO << "Failed to validate nonce";
disconnectPlugin();
return;
}
m_version = ver; m_version = ver;
QVariantMap registerMap; QVariantMap registerMap;