Skip to content

Javacard key mint 100 master #224

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

Merged
mdwivedi merged 2 commits into from
Sep 21, 2022
Merged

Javacard key mint 100 master #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993db17
Merge pull request #108 from divegeek/Javacard_KeyMint_100_master
subrahmanyaman Sep 13, 2022
50cc2ab
1. Ignore SIGPIPE signal and receive EPIPE error code from send call.
subrahmanyaman Sep 13, 2022
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
4 changes: 2 additions & 2 deletions HAL/SocketTransport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ keymaster_error_t SocketTransport::sendData(const vector<uint8_t>& inData, vecto
inDataPrependedLength.push_back(static_cast<uint8_t>(inData.size() & 0xFF));
inDataPrependedLength.insert(inDataPrependedLength.end(), inData.begin(), inData.end());

if (0 > send(mSocket, inDataPrependedLength.data(), inDataPrependedLength.size(), 0)) {
if (0 > send(mSocket, inDataPrependedLength.data(), inDataPrependedLength.size(), MSG_NOSIGNAL)) {
static int connectionResetCnt = 0; /* To avoid loop */
if (ECONNRESET == errno && connectionResetCnt == 0) {
if ((ECONNRESET == errno || EPIPE == errno) && connectionResetCnt == 0) {
// Connection reset. Try open socket and then sendData.
socketStatus = false;
connectionResetCnt++;
Expand Down
4 changes: 2 additions & 2 deletions ProvisioningTool/include/cppbor/cppbor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,12 +700,12 @@ class Map : public Item {
*
* If the searched-for `key` is not present, returns `nullptr`.
*
* Note that if the map is canonicalized (sorted), Map::get() peforms a binary search. If your
* Note that if the map is canonicalized (sorted), Map::get() performs a binary search. If your
* map is large and you're searching in it many times, it may be worthwhile to canonicalize it
* to make Map::get() faster. Any use of a method that might modify the map disables the
* speedup.
*/
template <typename Key, typename Enable = void>
template <typename Key, typename Enable>
const std::unique_ptr<Item>& get(Key key) const;

// Note that use of non-const operator[] marks the map as not canonicalized.
Expand Down
6 changes: 3 additions & 3 deletions ProvisioningTool/sample_json_keymint_gf.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"attest_ids": {
"brand": "Android",
"device": "generic_x86_64",
"product": "aosp_x86_64",
"device": "emulator_x86_64",
"product": "sdk_phone_x86_64",
"serial": "",
"imei": "000000000000000",
"meid": "000000000000000",
"manufacturer": "unknown",
"model": "AOSP on x86_64"
"model": "Android SDK built for x86_64"
},
"shared_secret": "0000000000000000000000000000000000000000000000000000000000000000",
"set_boot_params": {
Expand Down