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

Commit 31fc6604 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Support AES-CBC sample encryption in MediaDrm"

parents e92e6fbf 18cb1eca

drm/mediadrm/plugins/clearkey/CryptoPlugin.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ using android::status_t; 
// decrypted data.  In theory, the output size can be larger than the input

// size, but in practice this will never happen for AES-CTR.

ssize_t CryptoPlugin::decrypt(bool secure, const KeyId keyId, const Iv iv,

                              Mode mode, const void* srcPtr,

                              Mode mode, const Pattern &pattern, const void* srcPtr,

                              const SubSample* subSamples, size_t numSubSamples,

                              void* dstPtr, AString* errorDetailMsg) {

    if (secure) {

drm/mediadrm/plugins/clearkey/CryptoPlugin.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 


    virtual ssize_t decrypt(

            bool secure, const KeyId keyId, const Iv iv,

            Mode mode, const void* srcPtr,

            Mode mode, const Pattern &pattern, const void* srcPtr,

            const SubSample* subSamples, size_t numSubSamples,

            void* dstPtr, android::AString* errorDetailMsg);

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp

+6 −4
Original line number Diff line number Diff line
@@ -792,15 +792,17 @@ namespace android { 


    ssize_t

    MockCryptoPlugin::decrypt(bool secure, const uint8_t key[16], const uint8_t iv[16],

                              Mode mode, const void *srcPtr, const SubSample *subSamples,

                              size_t numSubSamples, void *dstPtr, AString * /* errorDetailMsg */)

            Mode mode, const Pattern &pattern, const void *srcPtr,

            const SubSample *subSamples, size_t numSubSamples,

            void *dstPtr, AString * /* errorDetailMsg */)

    {

        ALOGD("MockCryptoPlugin::decrypt(secure=%d, key=%s, iv=%s, mode=%d, src=%p, "

        ALOGD("MockCryptoPlugin::decrypt(secure=%d, key=%s, iv=%s, mode=%d, "

              "pattern:{encryptBlocks=%d, skipBlocks=%d} src=%p, "

              "subSamples=%s, dst=%p)",

              (int)secure,

              arrayToString(key, sizeof(key)).string(),

              arrayToString(iv, sizeof(iv)).string(),

              (int)mode, srcPtr,

              (int)mode, pattern.mEncryptBlocks, pattern.mSkipBlocks, srcPtr,

              subSamplesToString(subSamples, numSubSamples).string(),

              dstPtr);

        return OK;

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ namespace android { 


        ssize_t decrypt(bool secure,

            const uint8_t key[16], const uint8_t iv[16],

            Mode mode, const void *srcPtr,

            Mode mode, const Pattern &pattern, const void *srcPtr,

            const SubSample *subSamples, size_t numSubSamples,

            void *dstPtr, AString *errorDetailMsg);

    private:

include/media/ICrypto.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct ICrypto : public IInterface { 
            const uint8_t key[16],

            const uint8_t iv[16],

            CryptoPlugin::Mode mode,

            const CryptoPlugin::Pattern &pattern,

            const sp<IMemory> &sharedBuffer, size_t offset,

            const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,

            void *dstPtr,