Skip to content

Support sub-sample mapping in decryptShmem() #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajutras-linaro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support sub-sample mapping in decryptShmem() #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions cdmi/service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,18 @@ void decryptShmem(unsigned int idxMES, int idXchngSem, int idXchngShMem, int idS
uint8_t *mem_iv = (uint8_t *) MapSharedMemory(mesShmem->idIvShMem);
uint8_t *mem_sample = (uint8_t *) MapSharedMemory(mesShmem->idSampleShMem);

uint32_t *mem_subsample_data = NULL;
uint32_t subsample_count = mesShmem->subsampleDataSize / sizeof(uint32_t);
if(subsample_count > 0) {
/* When available, map the sub-sample data. */
mem_subsample_data = (uint32_t *) MapSharedMemory(mesShmem->idSubsampleDataShMem);
if(mem_subsample_data == NULL) {
CDMI_ELOG() << "decryptShmem: Cannot map subsample data";
cr = CDMi_S_FALSE;
goto handle_error;
}
}

static uint32_t clear_content_size = 0;
static uint8_t* clear_content = NULL;
/* FIXME: Releasing needs to be implemented using a separate
Expand All @@ -350,10 +362,9 @@ void decryptShmem(unsigned int idxMES, int idXchngSem, int idXchngShMem, int idS
}
#endif

/* FIXME: We don't support subsamples */
cr = pMediaEngineSession->Decrypt(
0, //number of subsamples
NULL, //subsamples
subsample_count, //number of subsamples
mem_subsample_data, //subsamples (optional)
mesShmem->ivSize,
mem_iv,
mesShmem->sampleSize,
Expand All @@ -377,15 +388,16 @@ void decryptShmem(unsigned int idxMES, int idXchngSem, int idXchngShMem, int idS
memcpy(mem_sample, clear_content, MIN(mesShmem->sampleSize, clear_content_size) );
#endif

#ifdef CFG_SECURE_DATA_PATH
handle_error:
#ifdef CFG_SECURE_DATA_PATH
socketServer.CloseFileDescriptor(secureFd);
secureFd = -1;
#endif

// detach all shared memories!
DetachExistingSharedMemory(mem_iv);
DetachExistingSharedMemory(mem_sample);
if(mem_subsample_data != NULL) DetachExistingSharedMemory(mem_subsample_data);

// unlock that clnt knows about finished decryption
UnlockSemaphore(idXchngSem, SEM_XCHNG_PULL);
Expand Down