Merge master to KM41#13

Merged

subrahmanyaman merged 257 commits intoJavacard_KM_41_AOSP_UPMERGE_0630from

Dec 9, 2021

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 28, 2020

Resructured code and related changes
cpathak
committed

Commits on Nov 29, 2020

Commits on Nov 30, 2020

Commits on Dec 1, 2020

Merge branch 'provision_split' into android_se_provider
BKSSM Venkateswarlu
committed
Merge pull request #13 from BKSSMVenkateswarlu/android_se_provider
Shawn Willden
authored
Merge pull request #41 from divegeek/master
BKSSMVenkateswarlu
authored

Commits on Dec 8, 2020

Added provision_tool source
BKSSM Venkateswarlu
committed
Fixed the VTS 4.1 EarlyBootEnded usecase with DeleteKey
BKSSM Venkateswarlu
committed

Commits on Dec 9, 2020

1. Used libjsoncpp for parsing json file
BKSSM Venkateswarlu
committed
Clear the certificate chain persisted in memory whenever provisionCertificateChain command
BKSSM Venkateswarlu
committed

Commits on Jan 11, 2021

Merge branch 'master' into provision_support
BKSSM Venkateswarlu
committed

Commits on Jan 12, 2021

HAL fixes shared by NXP team.
BKSSM Venkateswarlu
committed

Commits on Jan 13, 2021

Create operation handle map in HAL to differentiate between public and strongbox operations in update, finish and abort operations.
BKSSM Venkateswarlu
committed
Pass hal generated operation handle to abort() call from update and finish.
BKSSM Venkateswarlu
committed

Commits on Jan 14, 2021

Added comments for the newly added code.
BKSSM Venkateswarlu
committed
updated provisioning tool
BKSSM Venkateswarlu
committed

Commits on Jan 15, 2021

Used Rand_bytes for hal generated operation handle.
BKSSM Venkateswarlu
committed
Clearing the operation data inside the operation context
BKSSM Venkateswarlu
committed

Commits on Jan 17, 2021

Added comments for getBlockAlignedData function
BKSSM Venkateswarlu
committed
Merge pull request #42 from BKSSMVenkateswarlu/hal_fixes
BKSSMVenkateswarlu
authored

Commits on Jan 19, 2021

Handle extended errorcodes in HAL
BKSSM Venkateswarlu
committed
1. Exception handling for CryptoException and Generic exceptions
BKSSM Venkateswarlu
committed

Commits on Jan 20, 2021

Remove trusted confirmation related code
BKSSM Venkateswarlu
committed
Corrected the extended error code values.
BKSSM Venkateswarlu
committed
certificate chain input validation
BKSSM Venkateswarlu
committed

Commits on Jan 21, 2021

1. Renamed INS_SHARED_SECRET to INS_PRESHARED_SECRET.
BKSSM Venkateswarlu
committed
Fixed the issue with KMFunctionalTest
bvenkateswarlu
committed
Renamed SHARED_SECRET to PRESHARED_SECRET
BKSSM Venkateswarlu
committed
Merge pull request #43 from BKSSMVenkateswarlu/applet_fixes
BKSSMVenkateswarlu
authored
Merge pull request #44 from BKSSMVenkateswarlu/handle_extended_errorcodes
BKSSMVenkateswarlu
authored
Corrected the month milliseconds hex value
BKSSM Venkateswarlu
committed
Merge pull request #45 from BKSSMVenkateswarlu/applet_fixes
BKSSMVenkateswarlu
authored
Removed authenticationIdentifier from cert params
BKSSM Venkateswarlu
committed
Merge pull request #46 from BKSSMVenkateswarlu/handle_extended_errorcodes
BKSSMVenkateswarlu
authored
Fixed the issue with keyblob decryption with AndroidSEProvider
bvenkateswarlu
committed

Commits on Jan 22, 2021

Remove MAX_USES_PER_BOOT related code as it is not supported by strongbox
bvenkateswarlu
committed
generate random number for operation handle
bvenkateswarlu
committed
Corrected the condition for SE provisioned status
BKSSM Venkateswarlu
committed
Corrected the condition for SE provisioned status
BKSSM Venkateswarlu
committed

Commits on Jan 23, 2021

Merge branch 'master' into provision_support
BKSSM Venkateswarlu
committed

Commits on Jan 25, 2021

make provision as separate library
BKSSM Venkateswarlu
committed
Removed sample_json.txt
BKSSM Venkateswarlu
committed
Added uninit function
BKSSM Venkateswarlu
committed

Commits on Jan 26, 2021

modified the function to init and uninit
BKSSM Venkateswarlu
committed
Merge pull request #15 from BKSSMVenkateswarlu/master
Shawn Willden
authored

Commits on Jan 27, 2021

1. Renamed the certiicate and key file names in sample_json.txt
BKSSM Venkateswarlu
committed

Commits on Jan 29, 2021

Store master key as Key object rather than as a byte array
BKSSM Venkateswarlu
committed

Commits on Jan 31, 2021

Merge branch 'master' into provision_support
BKSSM Venkateswarlu
committed
updated the sample_json.txt to use 3 certificates instead of 2
BKSSM Venkateswarlu
committed

Commits on Feb 1, 2021

Removed the changes relating to storing master key as Key object
BKSSM Venkateswarlu
committed
Merge branch 'master' into provision_support
BKSSM Venkateswarlu
committed

Commits on Feb 2, 2021

Added log statements
BKSSM Venkateswarlu
committed
1. Corrected the convertToDate algorithm to generate correct time and
bvenkateswarlu
committed
Merge branch 'master' into provision_support
BKSSM Venkateswarlu
committed
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored

Commits on Feb 3, 2021

Corrected the tag EARLY_BOOT_ENDED to EARLY_BOOT_ONLY
BKSSM Venkateswarlu
committed
Merge pull request #16 from BKSSMVenkateswarlu/master
Shawn Willden
authored

Commits on Feb 5, 2021

store secrets as keyobjects instead as byte arrays.
bvenkateswarlu
committed

Commits on Feb 6, 2021

Updated the documentation comments
bvenkateswarlu
committed
Changed the key derivation alogorithm to hmac sign
bvenkateswarlu
committed

Commits on Feb 7, 2021

1. Removed unused functions in KMAESKey.java
bvenkateswarlu
committed
Update JavacardKeymaster4Device.cpp
BKSSMVenkateswarlu
authored
Added Copyright comment
bvenkateswarlu
committed
Removed commented code
bvenkateswarlu
committed
Merge pull request #47 from BKSSMVenkateswarlu/secrets_as_keyobjects
BKSSMVenkateswarlu
authored

Commits on Feb 8, 2021

Added few debug statements
bvenkateswarlu
committed

Commits on Feb 9, 2021

Fixed the issue with RSA private and public key buffer while copying
bvenkateswarlu
committed
Added testDesEcbPkcs7PaddingCorrupted test function
bvenkateswarlu
committed
Removed unused imports
bvenkateswarlu
committed
Removed unused/commented code.
bvenkateswarlu
committed
Merge pull request #48 from BKSSMVenkateswarlu/test_master
BKSSMVenkateswarlu
authored
Merge pull request #17 from BKSSMVenkateswarlu/master
Shawn Willden
authored
Merge pull request #2 from BKSSMVenkateswarlu/master
mdwivedi
authored
Update KMInteger.java
mdwivedi
authored
move_unsigned_compare to common code
Manish Dwivedi
committed
move_unsigned_compare to common code
Manish Dwivedi
committed

Commits on Feb 10, 2021

code cleanup
Manish Dwivedi
committed
Removed public key operations from Applet and provider code
bvenkateswarlu
committed
updated readROT function
bvenkateswarlu
committed
Added validation for block mode
bvenkateswarlu
committed
Removed unwanted exceptions from KMFunctionTest
bvenkateswarlu
committed
Merge pull request #3 from BKSSMVenkateswarlu/remove_public_operations
mdwivedi
authored
Merge branch 'master' into move_unsigned_compare
mdwivedi
authored
Merge pull request #4 from mdwivedi/move_unsigned_compare
mdwivedi
authored
Revert "Move unsigned compare"
mdwivedi
authored
Merge pull request #5 from mdwivedi/revert-4-move_unsigned_compare
mdwivedi
authored
Moving unsigned compare to KMInteger
Manish Dwivedi
committed
Removing error code
Manish Dwivedi
committed
code reformatting
Manish Dwivedi
committed

Commits on Feb 12, 2021

1. return INVALID_KEY_BLOB incase if parEncryptedKeyblob fails for any
bvenkateswarlu
committed

Commits on Feb 16, 2021

Merge pull request #19 from BKSSMVenkateswarlu/master
Shawn Willden
authored
Sending extending length APDU always
BKSSM Venkateswarlu
committed
Merge pull request #20 from BKSSMVenkateswarlu/master
Shawn Willden
authored

Commits on Feb 20, 2021

Merge pull request #56 from divegeek/master
BKSSMVenkateswarlu
authored

Commits on Feb 26, 2021

A Strongbox implementation need not support support DEVICE_UNIQUE_ATTESTATION, and
BKSSM Venkateswarlu
committed
Merge pull request #21 from BKSSMVenkateswarlu/master
Shawn Willden
authored

Commits on Mar 3, 2021

Clear all the operation state in setBootParams
bvenkateswarlu
committed

Commits on Mar 4, 2021

update the variable name from var to oprHandleBuf
BKSSM Venkateswarlu
committed
Merge pull request #57 from BKSSMVenkateswarlu/clear_all_operations
BKSSMVenkateswarlu
authored
1. In releaseOperation, renamed the variable name 'var'
BKSSM Venkateswarlu
committed
Merge pull request #22 from BKSSMVenkateswarlu/master
mdwivedi
authored

Commits on Mar 9, 2021

Added sample certificates and keys required while using provisioning tool
BKSSM Venkateswarlu
committed
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Renamed source file names
BKSSM Venkateswarlu
committed
Added JCProxy souce.
BKSSM Venkateswarlu
committed
Create README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Update README.md
BKSSMVenkateswarlu
authored
Merge pull request #58 from BKSSMVenkateswarlu/sample_test
BKSSMVenkateswarlu
authored
Merge pull request #23 from BKSSMVenkateswarlu/master
mdwivedi
authored

Commits on Mar 11, 2021

Merge pull request #59 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored

Commits on Mar 18, 2021

Fix the issue in the upgrade key command.
BKSSM Venkateswarlu
committed

Commits on Mar 19, 2021

Optimized the upgradeKey command flow
BKSSM Venkateswarlu
committed

Commits on Mar 21, 2021

Incorporated review comments
BKSSM Venkateswarlu
committed
Updated the comment
BKSSMVenkateswarlu
authored

Commits on Mar 22, 2021

Performance fix: Reduced NVM writes
bvenkateswarlu
committed
Renamed the keyRequiresUpgrade function with a meaningful name
bvenkateswarlu
committed

Commits on Mar 23, 2021

Commits on Mar 24, 2021

Commits on Mar 25, 2021

created an instanceTable inside KMType and remvoved instPtr from each
BKSSM Venkateswarlu
committed
Removed unused imports
BKSSM Venkateswarlu
committed
Applet should be able to upgrade even if provision is not done.
bvenkateswarlu
committed

Commits on Mar 28, 2021

Updated comment
BKSSMVenkateswarlu
authored

Commits on Mar 31, 2021

Commits on Apr 1, 2021

Merge pull request #63 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored
Applet should be able to upgrade even if provision is not done.
bvenkateswarlu
committed
Updated comment

BKSSMVenkateswarlu
authored and
bvenkateswarlu
committed

Commits on Apr 8, 2021

Reduced NVM writes inside KMOperationImpl of AndroidSEProvider
bvenkateswarlu
committed
Fixed compilation errors
bvenkatswarlu
committed
Proper indentation for KMOPerationImpl.java source file
BKSSM Venkateswarlu
committed

Commits on Apr 9, 2021

Changed the variable name from dFlag to isDataUpdated.
bvenkateswarlu
committed

Commits on Apr 12, 2021

Memory optimization in operation table.
BKSSM Venkateswarlu
committed
Removed begin/commit transaction from not required places
BKSSM Venkateswarlu
committed
Lock provision should not depend on setBoot parameters
BKSSM Venkateswarlu
committed

Commits on Apr 13, 2021

Commits on Apr 14, 2021

Commits on Apr 16, 2021

Merge pull request #67 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored
Merge pull request #68 from BKSSMVenkateswarlu/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored
Move operationtable to RAM and notifiy back to HAL about se reset
bvenkateswarlu
committed
Handle the reset event from Applet
BKSSM Venkateswarlu
committed
Move operationtable to RAM
bvenkateswarlu
committed

Commits on Apr 19, 2021

Card Reset change
bvenkatswarlu
committed
Added a new test case to test the card reset functionality
bvenkatswarlu
committed
Added a new test case to test reset events
BKSSM Venkateswarlu
committed
Updated the unit test
BKSSM Venkateswarlu
committed
updated the unittest
bvenkatswarlu
committed

Commits on Apr 20, 2021

Fixed the issue observed while executing vts
bvenkatswarlu
committed
Added comment and fixed one issue
bvenkatswarlu
committed

Commits on Apr 22, 2021

Clear the operation data associated with operation handle
BKSSM Venkateswarlu
committed
1. Handled the reset event in provision tool.
BKSSM Venkateswarlu
committed
Corrected the testcase
bvenkatswarlu
committed

Commits on Apr 23, 2021

separate os_version, os_patchlevel and vendor_patchlevel from other bootparamters
BKSSM Venkateswarlu
committed
separate os_version, os_patchlevel and vendor_patchlevel from other bootparamters

BKSSM Venkateswarlu
authored and
BKSSM Venkateswarlu
committed
send systemproperties at initialization time if it fails then try to
BKSSM Venkateswarlu
committed

Commits on Apr 26, 2021

1. Removed VTS_EMULATOR and instead used USE_OMAPI and USE_SEHAL
BKSSM Venkateswarlu
committed
Added logs for reset event
BKSSM Venkateswarlu
committed

Commits on Apr 27, 2021

Enable VTS_EMULATOR for x86 and x86_64 builds
BKSSM Venkateswarlu
committed
clear system properties in setBootParameters
BKSSM Venkateswarlu
committed
Addressed review comments in the Applet code
BKSSM Venkateswarlu
committed

Commits on Apr 28, 2021

renamed the function names appropriately
BKSSM Venkateswarlu
committed
Updated the comment
BKSSM Venkateswarlu
committed
Renamed canary bit name to power reset status
BKSSM Venkateswarlu
committed
Merge pull request #37 from BKSSMVenkateswarlu/separate_vbmeta_sysprop
mdwivedi
authored
Merge pull request #38 from divegeek/jc_keymaster_41_android_11
mdwivedi
authored
renamed function and variables names appropriately
bvenkatswarlu
committed
renamed function names and added comments.
BKSSM Venkateswarlu
committed
variable names changed properly
BKSSM Venkateswarlu
committed
Merge pull request #36 from BKSSMVenkateswarlu/jc_keymaster_41_android_11_nvm_phase_2
mdwivedi
authored

Commits on Apr 30, 2021

Commits on May 4, 2021

Added debug and error logs in hal apis.
nyamagoud
committed

Commits on May 7, 2021

Merge branch 'divegeek:jc_keymaster_41_android_11' into jc_keymaster_41_android_11
BKSSMVenkateswarlu
committed

Commits on Jun 25, 2021

Fix for attestation failures in VTS.
bvenkatswarlu
committed

Commits on Jun 26, 2021

Fix for attestation failures in VTS.
bvenkatswarlu
committed
Updated the README and sample json files
bvenkateswarlu
committed
Update README.md
BKSSMVenkateswarlu
authored
added comments
bvenkatswarlu
committed
Changed the version of keymaster in attestation
bvenkatswarlu
committed

Commits on Jun 29, 2021

Commits on Jul 6, 2021

Merge pull request #73 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored
Merge pull request #73 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu
authored
Fixed issue inside isEmpty function
BKSSM Venkateswarlu
committed
Fixed issue inside isEmpty function
BKSSM Venkateswarlu
committed

Commits on Aug 26, 2021

Commits on Dec 7, 2021

Commits on Dec 8, 2021

Commits on Dec 9, 2021