Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2232db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ARTSPConnection: Digest Auth: Respect the realm sent by the server" am: 5aac2989 

Change-Id: I9c4e6328be6e148eb091131842e25df123c2f1b4
parents 08115b00 5aac2989

media/libstagefright/rtsp/ARTSPConnection.cpp

+13 −1
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ void ARTSPConnection::performDisconnect() { 
    mPass.clear();

    mAuthType = NONE;

    mNonce.clear();

    mRealm.clear();



    mState = DISCONNECTED;

}
@@ -911,6 +912,14 @@ bool ARTSPConnection::parseAuthMethod(const sp<ARTSPResponse> &response) { 
        CHECK_GE(j, 0);



        mNonce.setTo(value, i + 7, j - i - 7);



        i = value.find("realm=");

        CHECK_GE(i, 0);

        CHECK_EQ(value.c_str()[i + 6], '\"');

        j = value.find("\"", i + 7);

        CHECK_GE(j, 0);



        mRealm.setTo(value, i + 7, j - i - 7);

    }



    return true;
@@ -993,7 +1002,7 @@ void ARTSPConnection::addAuthentication(AString *request) { 
    AString A1;

    A1.append(mUser);

    A1.append(":");

    A1.append("Streaming Server");

    A1.append(mRealm);

    A1.append(":");

    A1.append(mPass);
@@ -1029,6 +1038,9 @@ void ARTSPConnection::addAuthentication(AString *request) { 
    fragment.append("\", ");

    fragment.append("response=\"");

    fragment.append(digest);

    fragment.append("\", ");

    fragment.append("realm=\"");

    fragment.append(mRealm);

    fragment.append("\"");

    fragment.append("\r\n");

media/libstagefright/rtsp/ARTSPConnection.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ private: 
    AString mUser, mPass;

    AuthType mAuthType;

    AString mNonce;

    AString mRealm;

    int mSocket;

    int32_t mConnectionID;

    int32_t mNextCSeq;