Skip to content

Change SID/MID feedback signature #87

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
lauris71 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Change SID/MID feedback signature #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b76e52
Added CDocV1 tests
Jan 9, 2026
7a2b181
Added CDoc1 tests and cleaned up testing
Jan 9, 2026
2629756
More CDocCipher cleanups
Jan 13, 2026
4febb5c
Fix windows build
Jan 13, 2026
dd2cf68
Fix initializer order for gcc
Jan 13, 2026
5e4e80f
Use again absolute paths for tests
Jan 13, 2026
bb66be5
Create test tmp path if not exist
Jan 13, 2026
a4efe25
Change SID/MID callback signature to handle QR codes
Jan 14, 2026
0cab1cb
Apply suggestions from code review
lauris71 Jan 14, 2026
0da1fd8
Update cdoc/cdoc-tool.cpp
lauris71 Jan 14, 2026
75d1101
Update cdoc/cdoc-tool.cpp
lauris71 Jan 14, 2026
5b32d9f
Merge branch 'open-eid:master' into master
lauris71 Jan 14, 2026
87e5493
Merge branch 'master' into sid2
Jan 14, 2026
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
14 changes: 8 additions & 6 deletions cdoc/NetworkBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,9 @@ rsa_sign(int type, const unsigned char *m, unsigned int m_len, unsigned char *si
}

libcdoc::result_t
libcdoc::NetworkBackend::showVerificationCode(unsigned int code)
libcdoc::NetworkBackend::showFeedback(SIDMIDFeedback& feedback)
{
LOG_INFO("Verification code: {:04d}", code);
LOG_INFO("Verification code: {:04d} url: {}", feedback.code, feedback.url);
return OK;
}

Expand Down Expand Up @@ -747,8 +747,9 @@ libcdoc::NetworkBackend::signSID(std::vector<uint8_t>& dst, std::vector<uint8_t>
// Generate code
uint8_t b[32];
SHA256(digest.data(), digest.size(), b);
unsigned int code = ((b[30] << 8) | b[31]) % 10000;
result = showVerificationCode(code);
SIDMIDFeedback fb;
fb.code = ((b[30] << 8) | b[31]) % 10000;
result = showFeedback(fb);
if (result != OK) return result;

picojson::object aio1 = {
Expand Down Expand Up @@ -834,8 +835,9 @@ libcdoc::NetworkBackend::signMID(std::vector<uint8_t>& dst, std::vector<uint8_t>
std::string algo_name = algo_names[(int) algo];

// Generate code
unsigned int code = (((digest[0] & 0xfc) << 5) | (digest[digest.size() - 1] & 0x7f));
result = showVerificationCode(code);
SIDMIDFeedback fb;
fb.code = (((digest[0] & 0xfc) << 5) | (digest[digest.size() - 1] & 0x7f));
result = showFeedback(fb);
if (result != OK) return result;

// etsi/PNOEE-01234567890
Expand Down
14 changes: 10 additions & 4 deletions cdoc/NetworkBackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ struct CDOC_EXPORT NetworkBackend {
std::string password;
};

struct SIDMIDFeedback {
int code;
std::string url;
};

NetworkBackend() = default;
virtual ~NetworkBackend() noexcept = default;
NetworkBackend(const NetworkBackend&) = delete;
Expand Down Expand Up @@ -235,13 +240,14 @@ struct CDOC_EXPORT NetworkBackend {
}

/**
* @brief show MID/SID verification code
* @brief show MID/SID verification code or QR code
*
* Show SID/MID verification code or QR code. The default implementation logs the content with level INFO.
*
* Show SID/MID verification code. The default implementation logs it with level INFO.
* @param code verification code
* @param feedback SID/MID feedback data
* @return error code or OK
*/
virtual result_t showVerificationCode(unsigned int code);
virtual result_t showFeedback(SIDMIDFeedback& feedback);

/**
* @brief Sign digest with SmartID authentication key
Expand Down