Skip to content

Commit

Permalink
Merge libpcsc-cpp and libpcsc-mock repositories
Browse files Browse the repository at this point in the history
WE2-828

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Feb 8, 2024
1 parent d23066a commit 3d608b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:

- name: Configure
run: |
cmake "-GNinja" `
cmake "-GNinja" -S . -B build `
"-DCMAKE_TOOLCHAIN_FILE=${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
"-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" -S . -B build
"-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}"
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion lib/libelectronic-id
Submodule libelectronic-id updated 33 files
+4 −12 .github/workflows/cmake-linux-ubuntu.yml
+5 −15 .github/workflows/cmake-macos.yml
+6 −15 .github/workflows/cmake-windows.yml
+1 −3 .github/workflows/codeql.yml
+0 −3 .gitmodules
+0 −1 lib/libpcsc-cpp
+96 −0 lib/libpcsc-cpp/CMakeLists.txt
+21 −0 lib/libpcsc-cpp/LICENSE
+48 −0 lib/libpcsc-cpp/README.md
+8 −0 lib/libpcsc-cpp/docs/DEVELOPMENT.md
+175 −0 lib/libpcsc-cpp/include/flag-set-cpp/flag_set.hpp
+1,438 −0 lib/libpcsc-cpp/include/magic_enum/magic_enum.hpp
+140 −0 lib/libpcsc-cpp/include/pcsc-cpp/comp_winscard.hpp
+66 −0 lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp
+381 −0 lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp
+8 −0 lib/libpcsc-cpp/scripts/clang-format.sh
+66 −0 lib/libpcsc-cpp/src/Context.hpp
+54 −0 lib/libpcsc-cpp/src/Reader.cpp
+96 −0 lib/libpcsc-cpp/src/SCardCall.hpp
+303 −0 lib/libpcsc-cpp/src/SmartCard.cpp
+159 −0 lib/libpcsc-cpp/src/listReaders.cpp
+176 −0 lib/libpcsc-cpp/src/utils.cpp
+44 −0 lib/libpcsc-cpp/tests/integration/test-pcsc-cpp.cpp
+64 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/CMakeLists.txt
+21 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/LICENSE
+74 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/README.md
+ lib/libpcsc-cpp/tests/lib/libpcsc-mock/docs/libpcsc-mock.png
+131 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/include/pcsc-mock/pcsc-mock.hpp
+8 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/scripts/clang-format.sh
+315 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/src/pcsc-mock.cpp
+104 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/tests/pcsc-mock-test.cpp
+64 −0 lib/libpcsc-cpp/tests/mock/test-connect-to-card-transmit-apdus.cpp
+65 −0 lib/libpcsc-cpp/tests/mock/test-select-card-reader-and-card.cpp
2 changes: 1 addition & 1 deletion src/mac/js
Submodule js updated 52 files
+5 −5 .github/workflows/build.yml
+1 −1 LICENSE
+1 −1 README.md
+1 −1 lib/web-eid.js
+1,742 −5,734 package-lock.json
+3 −3 package.json
+43 −90 rollup.config.js
+19 −1 scripts/build-utils.mjs
+27 −18 scripts/build.mjs
+34 −0 src/background-firefox/consent.ts
+1 −1 src/background-safari/services/NativeAppService.ts
+1 −1 src/background/actions/TokenSigning/errorToResponse.ts
+1 −1 src/background/actions/TokenSigning/getCertificate.ts
+1 −1 src/background/actions/TokenSigning/index.ts
+1 −1 src/background/actions/TokenSigning/sign.ts
+1 −1 src/background/actions/TokenSigning/status.ts
+3 −1 src/background/actions/TokenSigning/threeLetterLanguageCodes.ts
+1 −1 src/background/actions/authenticate.ts
+1 −1 src/background/actions/getSigningCertificate.ts
+1 −1 src/background/actions/sign.ts
+1 −1 src/background/actions/status.ts
+1 −13 src/background/background.ts
+4 −1 src/background/services/NativeAppService.ts
+1 −1 src/config.ts
+1 −1 src/content/TokenSigning/injectPageScript.ts
+1 −1 src/content/content.ts
+1 −1 src/models/Browser.ts
+1 −1 src/models/Browser/Permissions.ts
+1 −1 src/models/Browser/Runtime.ts
+1 −1 src/models/Browser/Tabs.ts
+1 −1 src/models/StatusOptions.ts
+1 −1 src/models/TokenSigning/TokenSigningMessage.ts
+1 −1 src/models/TokenSigning/TokenSigningPromise.ts
+1 −1 src/models/TokenSigning/TokenSigningResponse.ts
+1 −1 src/models/TokenSigning/TokenSigningType.ts
+1 −1 src/resources/token-signing-page-script.ts
+1 −1 src/shared/ByteArray.ts
+1 −1 src/shared/Mutex.ts
+1 −1 src/shared/TokenSigningPageScript.ts
+1 −1 src/shared/actionErrorHandler.ts
+1 −1 src/shared/tokenSigningResponse.ts
+1 −1 src/shared/utils/__tests__/version-test.ts
+1 −1 src/shared/utils/calculateJsonSize.ts
+1 −1 src/shared/utils/checkCompatibility.ts
+1 −1 src/shared/utils/semver.ts
+1 −1 src/shared/utils/sender.ts
+1 −1 src/shared/utils/timing.ts
+28 −0 static/_locales/cs/messages.json
+28 −0 static/_locales/sk/messages.json
+1 −2 static/safari/manifest.json
+1 −2 static/safari/manifest_v3.json
+1 −1 static/views/installed.js

0 comments on commit 3d608b1

Please sign in to comment.