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

Commit c2114363 authored by Andreas Huber's avatar Andreas Huber
Browse files

We don't have access to the md5 implementation on the simulator, let's disable... 

We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
parent e09591ef

media/libstagefright/rtsp/ARTSPConnection.cpp

+10 −0
Original line number Diff line number Diff line
@@ -761,6 +761,12 @@ bool ARTSPConnection::parseAuthMethod(const sp<ARTSPResponse> &response) { 
    if (!strncmp(value.c_str(), "Basic", 5)) {

        mAuthType = BASIC;

    } else {

#if !defined(HAVE_ANDROID_OS)

        // We don't have access to the MD5 implementation on the simulator,

        // so we won't support digest authentication.

        return false;

#endif



        CHECK(!strncmp(value.c_str(), "Digest", 6));

        mAuthType = DIGEST;
@@ -776,6 +782,7 @@ bool ARTSPConnection::parseAuthMethod(const sp<ARTSPResponse> &response) { 
    return true;

}



#if defined(HAVE_ANDROID_OS)

static void H(const AString &s, AString *out) {

    out->clear();
@@ -804,6 +811,7 @@ static void H(const AString &s, AString *out) { 
        out->append(&nibble, 1);

    }

}

#endif



static void GetMethodAndURL(

        const AString &request, AString *method, AString *url) {
@@ -845,6 +853,7 @@ void ARTSPConnection::addAuthentication(AString *request) { 
        return;

    }



#if defined(HAVE_ANDROID_OS)

    CHECK_EQ((int)mAuthType, (int)DIGEST);



    AString method, url;
@@ -893,6 +902,7 @@ void ARTSPConnection::addAuthentication(AString *request) { 
    fragment.append("\r\n");



    request->insert(fragment, i + 2);

#endif

}



}  // namespace android