driver: apdu: at: don't expect space after "+CGLA:" (#238)

Some devices have a difference in format and do not add a space.

AT+CGLA=1,16,"81E2910003BF3C00"
+CGLA:4,"611A"

OK

.github/workflows/build.yaml

@@ -11,25 +11,28 @@ on:
 jobs:
   build:
     name: Build for ${{ matrix.build.name }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.build.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         build:
-          - {variant: make, name: Linux, artifact: linux-x64}
+          - {os: ubuntu-24.04, variant: make, name: Linux, artifact: linux-x64}
-          - {variant: debian, name: Debian, artifact: debian-x64}
+          - {os: ubuntu-24.04-arm, variant: make, name: Linux ARM, artifact: linux-arm}
-          - {variant: mingw, name: Windows with MinGW, artifact: windows-x64}
+          - {os: ubuntu-24.04, variant: make-without-lto, name: Linux (w/o LTO), artifact: linux-x64-without-lto}
-          - {variant: woa-mingw, name: Windows on ARM with MinGW, artifact: windows-arm64}
+          - {os: ubuntu-24.04-arm, variant: make-without-lto, name: Linux ARM (w/o LTO), artifact: linux-arm-without-lto}
-        include:
+          - {os: ubuntu-24.04, variant: debian, name: Debian, artifact: debian-x64}
-          - os: macos-latest
+          - {os: ubuntu-24.04-arm, variant: debian, name: Debian ARM, artifact: debian-arm}
-            build: {variant: make, name: macOS, artifact: macos-universal}
+          - {os: ubuntu-24.04, variant: mingw, name: Windows with MinGW, artifact: windows-x64}
+          - {os: ubuntu-24.04, variant: woa-mingw, name: Windows on ARM with MinGW, artifact: windows-arm64}
+          - {os: macos-15, variant: make, name: macOS, artifact: macos-universal}
+          - {os: macos-15, variant: make-without-lto, name: macOS (w/o LTO), artifact: macos-universal-without-lto}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Toolchain
-        run: ./scripts/setup-debian.sh
+        run: sudo ./scripts/setup-debian.sh ${{ matrix.build.variant }}
         if: runner.os == 'Linux'
 
       - name: Build for ${{ matrix.build.name }}
@@ -43,9 +46,10 @@ jobs:
         with:
           name: lpac-${{ env.SHA7 }}-${{ matrix.build.artifact }}
           path: ${{ github.workspace }}/build/*.*
+
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: startsWith(github.ref, 'refs/tags/v')
     needs: build
     permissions:

.gitignore

@@ -9,7 +9,6 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-build
 .vscode*
 .DS_Store
 

CMakeLists.txt

@@ -1,17 +1,36 @@
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.15)
 
 project (lpac
-    VERSION 2.0.2
+    VERSION 2.1.0
     HOMEPAGE_URL "https://github.com/estkme-group/lpac"
     DESCRIPTION "C-based eUICC LPA."
     LANGUAGES C)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(LPAC_CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH ${LPAC_CMAKE_MODULE_PATH})
+
+if(NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
+  # Git auto-ignore out-of-source build directory
+  file(GENERATE OUTPUT .gitignore CONTENT "*")
+endif()
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # add_compile_options(-Wall -Wextra -Wpedantic)
 
+# Enable LTO when possible.
+include(CheckIPOSupported)
+check_ipo_supported(RESULT result OUTPUT output)
+if(result)
+    if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
+        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    endif()
+else()
+    message(INFO "IPO is not supported: ${output}")
+endif()
+
 if (APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()

README.md

@@ -21,20 +21,17 @@ If you have any issue, please read [FAQ](docs/FAQ.md) first.
 
 [latest]: https://github.com/estkme-group/lpac/releases/latest
 
-## GUI Frontend
+## Software Ecosystem
 
 - [EasyLPAC] (Windows, Linux and macOS)
 - [{Open,Easy}EUICC][openeuicc] ([Mirror][openeuicc-mirror], Android)
+- [eSIM Manager (lpa-gtk)](https://codeberg.org/lucaweiss/lpa-gtk) (Linux Mobile)
+- [rlpa-server](https://github.com/estkme-group/rlpa-server) for eSTK.me Cloud Enhance function
 
 [easylpac]: https://github.com/creamlike1024/EasyLPAC/releases/latest
 [openeuicc]: https://gitea.angry.im/PeterCxy/OpenEUICC
 [openeuicc-mirror]: https://github.com/estkme-group/openeuicc
 
-## Cloud Enhance
-
-- [rlpa-server.php](src/rlpa-server.php) (Written in PHP)
-- [eSTK.me Cloud Enhance Server](https://github.com/damonto/estkme-cloud) (Written in Golang)
-
 ## Thanks
 
 [![Contributors][contrib]][contributors]
@@ -46,7 +43,9 @@ If you have any issue, please read [FAQ](docs/FAQ.md) first.
 
 ## License
 
-- lpac ([/src](src), [/driver](driver)): AGPL-3.0
+- lpac ([/src](src), [/driver](driver)): AGPL-v3.0-only
-- libeuicc ([/euicc](euicc)): LGPL-v2
+- libeuicc ([/euicc](euicc)): LGPL-v2.1-only or Commercial License Agreement with ESTKME TECHNOLOGY LIMITED, Hong Kong
+- cjson ([/cjson](cjson)): MIT
+- dlfcn-win32 ([/dlfcn-win32](dlfcn-win32)): MIT
 
-Copyright © 2023-2024 eSTKme Group
+Copyright © 2023-2025 ESTKME TECHNOLOGY LIMITED, Hong Kong

dlfcn-win32/dlfcn.c

@@ -758,7 +758,7 @@ static BOOL is_import_thunk( const void *addr )
 #endif
 }
 
-/* Return adress from the import address table (iat),
+/* Return address from the import address table (iat),
  * if the original address points to a thunk table entry.
  */
 static void *get_address_from_import_address_table( void *iat, DWORD iat_size, const void *addr )

docs/ENVVARS.md

@@ -2,19 +2,26 @@
 
 ## General
 
+* `LPAC_CUSTOM_ES10X_MSS`: specify maximum segment size for ES10x APDU backend. (default: 120, min: 6, max: 255)
+* `LPAC_CUSTOM_ISD_R_AID`: specify which AID will be used to open the logic channel. (hex string, 32 chars)
 * `LPAC_APDU`: specify which APDU backend will be used. Values:
   - `at`: use AT commands interface used by LTE module
   - `pcsc`: use PC/SC Smart Card API
   - `stdio`: use standard input/output
+  - `qmi`: use QMI
   - `qmi_qrtr`: use QMI over QRTR
+  - `mbim`: use MBIM
   - GBinder-based backends for `libhybris` (Halium) distributions:
     - `gbinder_hidl`: use HIDL IRadio (SoC launched before Android 13)
 * `LPAC_HTTP`: specify which HTTP backend will be used.
   - `curl`: use libcurl
-  - `stdio`: use standard input/ouput
+  - `stdio`: use standard input/output
 * `AT_DEVICE`: specify which serial port device will be used by AT APDU backend.
-* `UIM_SLOT`: specify which UIM slot will be used by QMI QRTR APDU backend. (default: 1)
+* `QMI_DEVICE`: specify which QMI device will be used by QMI APDU backend.
+* `UIM_SLOT`: specify which UIM slot will be used by QMI and MBIM APDU backends. (default: 1, slot number starts from 1)
 * `DRIVER_IFID`: specify which PC/SC interface will be used by PC/SC APDU backend.
+* `MBIM_DEVICE`: specify which MBIM device will be used by MBIM APDU backend. (default: `/dev/cdc-wdm0`)
+* `MBIM_USE_PROXY`: tell the MBIM APDU backend to use the mbim-proxy. (default: 0, anything other than 0 means true)
 
 ## Debug
 

docs/LINUX-DIST.md

@@ -50,3 +50,10 @@ nix-env -i lpac
 ```
 
 see <https://github.com/nix-community/nur-combined/blob/master/repos/linyinfeng/pkgs/lpac/default.nix>
+
+## Ubuntu and Debian/Devuan
+
+> Minimum available release: Ubuntu [14.04 Trusty Tahr](https://releases.ubuntu.com/14.04/)
+> (Published on 2024-09-01)
+
+see <https://launchpad.net/~daniel-gimpelevich/+archive/ubuntu/ssl/+sourcepub/17063242/+listing-archive-extra>

docs/USAGE.md

@@ -1,10 +1,10 @@
 ## Usage
 
-In Linux, you need install `pcscd`, `pcsclite` and `libcurl`.
+In Linux, you need to install `pcscd`, `pcsclite` and `libcurl`.
 
-APDU and HTTP interfaces of lpac has serval backends, you need specify `$LPAC_APDU` and `$LPAC_HTTP` environment variable to interface library path. If not specified, it will use `pcsc` and `curl`. See also [environment variables](ENVVARS.md).
+APDU and HTTP interfaces of lpac has several backends, you need to specify `$LPAC_APDU` and `$LPAC_HTTP` environment variables to interface library path. If not specified, it will use `pcsc` and `curl`. See also [environment variables](ENVVARS.md).
 
-Using `at` APDU backend need access permission to serial port (normally `/dev/ttyUSBx`). On Arch Linux, you can add yourself to `uucp` group by `sudo usermod -aG uucp $USER`. On other distro, you may need add yourself into `dialout` group. If your serial port is not `/dev/ttyUSB0`, please use `$AT_DEVICE` to specify which one you want to use.
+Using `at` APDU backend need access permission to serial port (normally `/dev/ttyUSBx`). On Arch Linux, you can add yourself to `uucp` group by `sudo usermod -aG uucp $USER`. On other distro, you may need to add yourself into `dialout` group. If your serial port is not `/dev/ttyUSB0`, please use `$AT_DEVICE` to specify which one you want to use.
 
 ## CLI
 
@@ -151,7 +151,7 @@ lpac profile <subcommand> [parameters]
 ```
 
 > [!NOTE]
-> Some eUICC chip have trouble when enable profile (e.g. These removeable eUICC cards from ECP), try AID, ICCID, refreshFlag with 1 or 0 to find out the working way for these chips.
+> Some eUICC chips have trouble when enabling profile (e.g. These removable eUICC cards from ECP), try AID, ICCID, refreshFlag with 1 or 0 to find out the working way for these chips.
 
 There is no secondary confirmation for deleting a Profile, so please perform it with caution.
 > [!NOTE]
@@ -163,7 +163,8 @@ There is no secondary confirmation for deleting a Profile, so please perform it
 - `-m`: Matching ID, activation code. optional.
 - `-c`: Confirmation Code, optional.
 - `-i`: The IMEI of the device to which Profile is to be downloaded, optional.
-- `-a`: LPA qrcode activation code string, e.g: `LPA:1$<sm-dp+ domain>$<matching id>`, if provided this option takes precedence over the `-s` and `-m` options, optional.
+- `-a`: LPA qrcode activation code string, e.g: `LPA:1$<sm-dp+ domain>$<matching id>`, if provided, this option takes precedence over the `-s` and `-m` options, optional.
+- `-p`: Interactive preview mode, optional.
 
 <details>
 
@@ -272,7 +273,7 @@ lpac notification <subcommand> [parameters]
 ```
 
 > [!NOTE]
-> Downstream developers or end users should process Notification as soon as possible when they exist to comply with GSMA specifications. lpac will not automatically delete the Notification after sending it, and you need to delete it manually.
+> Downstream developers or end users should process Notification as soon as possible when they exist to comply with GSMA specifications. lpac will not automatically delete the Notification after sending it. You can pass `-r` to `notification process` or you need to delete it manually.
 
 <details>
 
@@ -314,6 +315,19 @@ lpac notification <subcommand> [parameters]
 
 </details>
 
+##### Processing requires connection to server and the following optional parameters:
+
+The following parameters can be used to customize the behavior of `notification process`:
+
+- `-a`: Process all notifications
+- `-r`: Automatically remove processed notifications
+
+##### Removing supports the following optional parameters:
+
+The following parameters can be used to customize the behavior of `notification remove`:
+
+- `-a`: Remove all notifications
+
 #### driver
 
-Now there is only one command: `lpac driver apdu list` to get card reader list.
+Now, there is only one command: `lpac driver apdu list` to get the card reader list.

driver/CMakeLists.txt

@@ -2,9 +2,15 @@ include(CMakeDependentOption)
 cmake_dependent_option(LPAC_DYNAMIC_DRIVERS "Build lpac/libeuicc driver backends as a dynamic library" OFF "LPAC_DYNAMIC_LIBEUICC" OFF)
 
 option(LPAC_WITH_APDU_PCSC "Build APDU PCSC Backend (requires PCSC libraries)" ON)
+if(LINUX)
     option(LPAC_WITH_APDU_AT "Build APDU AT Backend" ON)
+else()
+    option(LPAC_WITH_APDU_AT "Build APDU AT Backend" OFF)
+endif()
 option(LPAC_WITH_APDU_GBINDER "Build APDU Gbinder backend for libhybris devices (requires gbinder headers)" OFF)
+option(LPAC_WITH_APDU_QMI "Build QMI backend for Qualcomm devices (requires libqmi)" OFF)
 option(LPAC_WITH_APDU_QMI_QRTR "Build QMI-over-QRTR backend for Qualcomm devices (requires libqrtr and libqmi headers)" OFF)
+option(LPAC_WITH_APDU_MBIM "Build MBIM backend for MBIM devices (requires libmbim)" OFF)
 
 option(LPAC_WITH_HTTP_CURL "Build HTTP Curl interface" ON)
 
@@ -25,6 +31,7 @@ if(LPAC_WITH_APDU_PCSC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLPAC_WITH_APDU_PCSC")
     target_sources(euicc-drivers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/apdu/pcsc.c)
     if(WIN32)
+        target_sources(euicc-drivers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/apdu/pcsc_win32.c)
         target_link_libraries(euicc-drivers winscard)
     elseif(APPLE)
         target_link_libraries(euicc-drivers "-framework PCSC")
@@ -59,12 +66,29 @@ if(LPAC_WITH_APDU_GBINDER)
     endif()
 endif()
 
+if(LPAC_WITH_APDU_QMI)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLPAC_WITH_APDU_QMI")
+    target_sources(euicc-drivers PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_helpers.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_common.c)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(QMI_GLIB REQUIRED IMPORTED_TARGET qmi-glib>=1.35.5)
+    target_link_libraries(euicc-drivers PkgConfig::QMI_GLIB)
+    if(LPAC_DYNAMIC_DRIVERS)
+        list(APPEND LIBEUICC_DRIVERS_REQUIRES "qmi-glib")
+    endif()
+endif()
+
 if(LPAC_WITH_APDU_QMI_QRTR)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLPAC_WITH_APDU_QMI_QRTR")
-    target_sources(euicc-drivers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_qrtr.c ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_qrtr_helpers.c)
+    target_sources(euicc-drivers PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_qrtr.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_helpers.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/qmi_common.c)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(QRTR_GLIB REQUIRED IMPORTED_TARGET qrtr-glib)
-    pkg_check_modules(QMI_GLIB REQUIRED IMPORTED_TARGET qmi-glib)
+    pkg_check_modules(QMI_GLIB REQUIRED IMPORTED_TARGET qmi-glib>=1.35.5)
     target_link_libraries(euicc-drivers PkgConfig::QRTR_GLIB PkgConfig::QMI_GLIB)
     if(LPAC_DYNAMIC_DRIVERS)
         list(APPEND LIBEUICC_DRIVERS_REQUIRES "qrtr-glib")
@@ -72,6 +96,19 @@ if(LPAC_WITH_APDU_QMI_QRTR)
     endif()
 endif()
 
+if(LPAC_WITH_APDU_MBIM)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLPAC_WITH_APDU_MBIM")
+    target_sources(euicc-drivers PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/mbim.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/apdu/mbim_helpers.c)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(MBIM_GLIB REQUIRED IMPORTED_TARGET mbim-glib)
+    target_link_libraries(euicc-drivers PkgConfig::MBIM_GLIB PkgConfig::MBIM_GLIB)
+    if(LPAC_DYNAMIC_DRIVERS)
+        list(APPEND LIBEUICC_DRIVERS_REQUIRES "mbim-glib")
+    endif()
+endif()
+
 if(LPAC_WITH_HTTP_CURL)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLPAC_WITH_HTTP_CURL")
     target_sources(euicc-drivers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/http/curl.c)

driver/LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

driver/apdu/at.c

@@ -9,22 +9,24 @@
 #include <euicc/interface.h>
 #include <euicc/hexutil.h>
 
+#define AT_BUFFER_SIZE 20480
 static FILE *fuart;
 static int logic_channel = 0;
+static char *buffer;
 
 static int at_expect(char **response, const char *expected)
 {
-    char buffer[1024];
+    memset(buffer, 0, AT_BUFFER_SIZE);
 
     if (response)
         *response = NULL;
 
     while (1)
     {
-        fgets(buffer, sizeof(buffer), fuart);
+        fgets(buffer, AT_BUFFER_SIZE, fuart);
         buffer[strcspn(buffer, "\r\n")] = 0;
         if (getenv("AT_DEBUG"))
-            printf("AT_DEBUG: %s\r\n", buffer);
+            printf("AT_DEBUG: %s\n", buffer);
         if (strcmp(buffer, "ERROR") == 0)
         {
             return -1;
@@ -59,6 +61,7 @@ static int apdu_interface_connect(struct euicc_ctx *ctx)
         fprintf(stderr, "Failed to open device: %s\n", device);
         return -1;
     }
+    setbuf(fuart, NULL);
 
     fprintf(fuart, "AT+CCHO=?\r\n");
     if (at_expect(NULL, NULL))
@@ -210,6 +213,13 @@ static int libapduinterface_init(struct euicc_apdu_interface *ifstruct)
     ifstruct->logic_channel_close = apdu_interface_logic_channel_close;
     ifstruct->transmit = apdu_interface_transmit;
 
+    buffer = malloc(AT_BUFFER_SIZE);
+    if (!buffer)
+    {
+        fprintf(stderr, "Failed to allocate memory\n");
+        return -1;
+    }
+
     return 0;
 }
 
@@ -218,8 +228,9 @@ static int libapduinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libapduinterface_fini(void)
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
 {
+    free(buffer);
 }
 
 const struct euicc_driver driver_apdu_at = {
@@ -227,5 +238,5 @@ const struct euicc_driver driver_apdu_at = {
     .name = "at",
     .init = (int (*)(void *))libapduinterface_init,
     .main = libapduinterface_main,
-    .fini = libapduinterface_fini,
+    .fini = (void (*)(void *))libapduinterface_fini,
 };

driver/apdu/gbinder_hidl.c

@@ -90,7 +90,7 @@ static GBinderLocalReply *radio_response_transact(
         case HIDL_SERVICE_ICC_OPEN_LOGICAL_CHANNEL_CALLBACK:
             gbinder_reader_read_int32(&reader, &lastIntResp);
             break;
-        case HIDL_SERVICE_ICC_TRANSMIT_APDU_LOGICAL_CHANNEL_CALLBACK:
+        case HIDL_SERVICE_ICC_TRANSMIT_APDU_LOGICAL_CHANNEL_CALLBACK: {
             const struct icc_io_result *icc_io_res = gbinder_reader_read_hidl_struct(&reader, struct icc_io_result);
             // We cannot rely on the *req pointer being valid after we return
             lastIccIoResult.sw1 = icc_io_res->sw1;
@@ -100,6 +100,7 @@ static GBinderLocalReply *radio_response_transact(
             lastIccIoResult.simResponse.owns_buffer = TRUE;
             break;
         }
+    }
 
 out:
     g_main_loop_quit(binder_loop);
@@ -314,14 +315,14 @@ static int libapduinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libapduinterface_fini(void)
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
 {
 }
 
 const struct euicc_driver driver_apdu_gbinder_hidl = {
     .type = DRIVER_APDU,
     .name = "gbinder_hidl",
-    .init = libapduinterface_init,
+    .init = (int (*)(void *))libapduinterface_init,
     .main = libapduinterface_main,
-    .fini = libapduinterface_fini,
+    .fini = (void (*)(void *))libapduinterface_fini,
 };

driver/apdu/mbim.c

@@ -0,0 +1,367 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Frans Klaver <frans.klaver@vislink.com>
+ */
+#include "mbim.h"
+
+#include <libmbim-glib.h>
+#include <stdio.h>
+#include <euicc/interface.h>
+#include <euicc/euicc.h>
+#include "mbim_helpers.h"
+
+struct mbim_data {
+    const char *device_path;
+    int last_channel_id;
+    gboolean use_proxy;
+    guint32 uim_slot;
+    GMainContext *context;
+    MbimDevice *device;
+};
+
+static gboolean is_sim_available(struct mbim_data *mbim_priv)
+{
+    MbimMessage *request = mbim_message_subscriber_ready_status_query_new(NULL);
+    g_autoptr(MbimMessage) response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, request, NULL
+    );
+    if (!response)
+        return FALSE;
+
+    MbimSubscriberReadyState ready_state;
+    if (!mbim_message_subscriber_ready_status_response_parse(
+        response, &ready_state, NULL, NULL, NULL, NULL, NULL, NULL
+    )) {
+        return FALSE;
+    }
+
+    switch (ready_state) {
+    case MBIM_SUBSCRIBER_READY_STATE_NO_ESIM_PROFILE:
+    case MBIM_SUBSCRIBER_READY_STATE_INITIALIZED:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
+static int select_sim_slot(struct mbim_data *mbim_priv)
+{
+    g_autoptr(GError) error = NULL;
+
+    MbimMessage *current_slot_request =
+        mbim_message_ms_basic_connect_extensions_device_slot_mappings_query_new(NULL);
+
+    g_autoptr(MbimMessage) current_slot_response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, current_slot_request, &error
+    );
+    if (!current_slot_response) {
+        fprintf(stderr, "error: device didn't respond: %s\n", error->message);
+        return -1;
+    }
+
+    guint32 current_slot_count;
+    g_autoptr(MbimSlotArray) current_slots = NULL;
+    if (!mbim_message_ms_basic_connect_extensions_device_slot_mappings_response_parse(
+        current_slot_response, &current_slot_count, &current_slots, &error
+    )) {
+        fprintf(stderr, "error: sim select response could not be parsed: %s\n", error->message);
+        return -1;
+    }
+
+    if (current_slot_count && current_slots[0]->slot == mbim_priv->uim_slot) {
+        return 0;
+    }
+
+    g_autoptr(GPtrArray) new_slot_array = g_ptr_array_new_with_free_func(g_free);
+    MbimSlot *new_slot = g_new(MbimSlot, 1);
+    new_slot->slot = mbim_priv->uim_slot;
+    g_ptr_array_add(new_slot_array, new_slot);
+
+    MbimMessage *update_slot_request = mbim_message_ms_basic_connect_extensions_device_slot_mappings_set_new(
+        new_slot_array->len, (const MbimSlot **)new_slot_array->pdata, &error
+    );
+    if (!update_slot_request) {
+        fprintf(stderr, "error: unable to select sim slot: %s\n", error->message);
+        return -1;
+    }
+
+    g_autoptr(MbimMessage) update_slot_response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, update_slot_request, &error
+    );
+    if (!update_slot_response) {
+        fprintf(stderr, "error: device didn't respond: %s\n", error->message);
+        return -1;
+    }
+
+    guint32 slot_count;
+    g_autoptr(MbimSlotArray) updated_slots = NULL;
+    if (!mbim_message_ms_basic_connect_extensions_device_slot_mappings_response_parse(
+        update_slot_response, &slot_count, &updated_slots, &error
+    )) {
+        fprintf(stderr, "error: sim select response could not be parsed: %s\n", error->message);
+        return -1;
+    }
+
+    int retries = 20;
+    while (retries--) {
+        if (is_sim_available(mbim_priv)) {
+            return 0;
+        }
+    }
+
+    fprintf(stderr, "sim did not become available\n");
+    return -1;
+}
+
+static int apdu_interface_connect(struct euicc_ctx *ctx)
+{
+    struct mbim_data *mbim_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    GFile *file;
+
+    file = g_file_new_for_path(mbim_priv->device_path);
+
+    mbim_priv->context = g_main_context_new();
+
+    mbim_priv->device = mbim_device_new_from_path(file, mbim_priv->context, &error);
+    if (!mbim_priv->device) {
+        fprintf(stderr, "error: create mbim device from path failed: %s\n", error->message);
+        return -1;
+    }
+
+    MbimDeviceOpenFlags open_flags = MBIM_DEVICE_OPEN_FLAGS_NONE;
+    if (mbim_priv->use_proxy)
+        open_flags |= MBIM_DEVICE_OPEN_FLAGS_PROXY;
+
+    mbim_device_open_sync(mbim_priv->device, open_flags, mbim_priv->context, &error);
+    if (error) {
+        fprintf(stderr, "error: open mbim device failed: %s\n", error->message);
+        return -1;
+    }
+
+    return select_sim_slot(mbim_priv);
+}
+
+/*
+ * Allocate storage in rx and copy the contents of response_data there. Also
+ * tack the status at the end, as the MBIM protocol separates the status from
+ * the rest of the response.
+ */
+static int copy_data_with_status(
+    uint8_t **rx, uint32_t *rx_len,
+    const guint8 *response_data, guint32 response_size,
+    guint32 status)
+{
+    *rx_len = response_size + 2;
+    *rx = malloc(*rx_len);
+    if (!*rx)
+        return -1;
+
+    memcpy(*rx, response_data, response_size);
+    (*rx)[*rx_len - 2] = status & 0xff;
+    (*rx)[*rx_len - 1] = (status >> 8) & 0xff;
+
+    return 0;
+}
+
+static int mbim_apdu_interface_transmit(
+    struct euicc_ctx *ctx,
+    uint8_t **rx, uint32_t *rx_len,
+    const uint8_t *tx, uint32_t tx_len)
+{
+    struct mbim_data *mbim_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+
+    MbimMessage *request = mbim_message_ms_uicc_low_level_access_apdu_set_new(
+        mbim_priv->last_channel_id,
+        MBIM_UICC_SECURE_MESSAGING_NONE,
+        MBIM_UICC_CLASS_BYTE_TYPE_INTER_INDUSTRY,
+        tx_len,
+        tx,
+        &error
+    );
+    if (!request) {
+        fprintf(stderr, "error: creating apdu message failed: %s\n", error->message);
+        return -1;
+    }
+
+    g_autoptr(MbimMessage) response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, request, &error
+    );
+    if (!response) {
+        fprintf(stderr, "error: no apdu response received: %s\n", error->message);
+        return -1;
+    }
+
+    guint32 status = 0;
+    guint32 response_size = 0;
+    const guint8 *response_data = NULL;
+
+    if (!mbim_message_ms_uicc_low_level_access_apdu_response_parse(
+       response, &status, &response_size, &response_data, &error
+   )) {
+        fprintf(stderr, "error: unable to parse apdu response: %s\n", error->message);
+        return -1;
+    }
+
+    return copy_data_with_status(rx, rx_len, response_data, response_size, status);
+}
+
+static int mbim_apdu_interface_logic_channel_open(
+    struct euicc_ctx *ctx,
+    const uint8_t *aid,
+    uint8_t aid_len)
+{
+    struct mbim_data *mbim_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    guint8 channel_id;
+
+    MbimMessage *request = mbim_message_ms_uicc_low_level_access_open_channel_set_new(
+        aid_len, aid, 0, 1, &error
+    );
+    if (!request) {
+        fprintf(stderr, "error: creating channel message failed: %s\n", error->message);
+        return -1;
+    }
+
+    g_autoptr(MbimMessage) response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, request, &error
+    );
+    if (!response) {
+        fprintf(stderr, "error: no channel response received: %s\n", error->message);
+        return -1;
+    }
+
+    guint32 status = 0;
+    guint32 channel = -1;
+    guint32 response_size = 0;
+    const guint8 *response_data = NULL;
+
+    if (!mbim_message_ms_uicc_low_level_access_open_channel_response_parse(
+        response, &status, &channel, &response_size, &response_data, &error
+    )) {
+        fprintf(stderr, "error: unable to parse channel response: %s\n", error->message);
+        return -1;
+    }
+
+    mbim_priv->last_channel_id = channel;
+    return channel;
+}
+
+static void mbim_apdu_interface_logic_channel_close(struct euicc_ctx *ctx, uint8_t channel)
+{
+    struct mbim_data *mbim_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+
+    MbimMessage *request = mbim_message_ms_uicc_low_level_access_close_channel_set_new(
+        channel, 1, &error
+    );
+    if (!request) {
+        fprintf(stderr, "error: creating channel message failed: %s\n", error->message);
+        return;
+    }
+
+    g_autoptr(MbimMessage) response = mbim_device_command_sync(
+        mbim_priv->device, mbim_priv->context, request, &error
+    );
+    if (!response) {
+        fprintf(stderr, "error: no channel response received: %s\n", error->message);
+        return;
+    }
+
+    guint32 status = 0;
+
+    if (!mbim_message_ms_uicc_low_level_access_close_channel_response_parse(
+        response, &status, &error
+    )) {
+        fprintf(stderr, "error: unable to parse channel response: %s\n", error->message);
+        return;
+    }
+
+    if (channel == mbim_priv->last_channel_id)
+        mbim_priv->last_channel_id = -1;
+}
+
+static void mbim_apdu_interface_disconnect(struct euicc_ctx *ctx)
+{
+    struct mbim_data *mbim_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+
+    if (mbim_priv->last_channel_id > 0)
+    {
+        fprintf(stderr, "Cleaning up leaked APDU channel %d\n", mbim_priv->last_channel_id);
+        mbim_apdu_interface_logic_channel_close(NULL, mbim_priv->last_channel_id);
+        mbim_priv->last_channel_id = -1;
+    }
+
+    mbim_device_close_sync(mbim_priv->device, mbim_priv->context, &error);
+
+    g_main_context_unref(mbim_priv->context);
+    mbim_priv->context = NULL;
+}
+
+static int libapduinterface_init(struct euicc_apdu_interface *ifstruct)
+{
+    struct mbim_data *mbim_priv;
+
+    guint32 uim_slot = 0;
+    /*
+     * We're using the same UIM_SLOT environment variable as the QMI backends.
+     * QMI uses 1-based indexing for the sim slots. MBIM uses 0-based indexing,
+     * so account for that.
+     */
+    const char *env_uim_slot = getenv("UIM_SLOT");
+    if (env_uim_slot) {
+        uim_slot = atoi(env_uim_slot);
+        if (uim_slot == 0) {
+            fprintf(stderr, "error: Invalid UIM_SLOT: '%s'\n", env_uim_slot);
+            return -1;
+        }
+        uim_slot--;
+    }
+
+    mbim_priv = malloc(sizeof(struct mbim_data));
+    if (!mbim_priv) {
+        fprintf(stderr, "Failed allocating memory\n");
+        return -1;
+    }
+
+    mbim_priv->uim_slot = uim_slot;
+
+    const char *use_proxy = getenv("MBIM_USE_PROXY");
+    if (use_proxy && strcmp(use_proxy, "0") != 0) {
+        mbim_priv->use_proxy = TRUE;
+    }
+
+    if (!(mbim_priv->device_path = getenv("MBIM_DEVICE"))) {
+        mbim_priv->device_path = "/dev/cdc-wdm0";
+    }
+
+    memset(ifstruct, 0, sizeof(struct euicc_apdu_interface));
+    ifstruct->connect = apdu_interface_connect;
+    ifstruct->disconnect = mbim_apdu_interface_disconnect;
+    ifstruct->logic_channel_open = mbim_apdu_interface_logic_channel_open;
+    ifstruct->logic_channel_close = mbim_apdu_interface_logic_channel_close;
+    ifstruct->transmit = mbim_apdu_interface_transmit;
+    ifstruct->userdata = mbim_priv;
+
+    return 0;
+}
+
+static int libapduinterface_main(int argc, char **argv)
+{
+    return 0;
+}
+
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
+{
+    g_free(ifstruct->userdata);
+}
+
+const struct euicc_driver driver_apdu_mbim = {
+    .type = DRIVER_APDU,
+    .name = "mbim",
+    .init = (int (*)(void *))libapduinterface_init,
+    .main = libapduinterface_main,
+    .fini = (void (*)(void *))libapduinterface_fini,
+};

driver/apdu/mbim.h

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Frans Klaver <frans.klaver@vislink.com>
+ */
+#pragma once
+#include <driver.private.h>
+
+extern const struct euicc_driver driver_apdu_mbim;

driver/apdu/mbim_helpers.c

@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: MIT
+/*
+ Copyright (c) 2024, Frans Klaver <frans.klaver@vislink.com>
+ */
+
+#include "mbim_helpers.h"
+#include <libmbim-glib.h>
+
+static void
+async_result_ready(GObject *source_object,
+                   GAsyncResult *res,
+                   gpointer user_data)
+{
+    GAsyncResult **result_out = user_data;
+
+    g_assert(*result_out == NULL);
+    *result_out = g_object_ref(res);
+}
+
+MbimDevice *
+mbim_device_new_from_path(GFile *file,
+                         GMainContext *context,
+                         GError **error)
+{
+    g_autoptr(GMainContextPusher) pusher = NULL;
+    g_autoptr(GAsyncResult) result = NULL;
+    g_autofree gchar *id = NULL;
+
+    pusher = g_main_context_pusher_new(context);
+
+    id = g_file_get_path (file);
+    if (id)
+        mbim_device_new(file,
+                       NULL,
+                       async_result_ready,
+                       &result);
+
+    while (!result)
+        g_main_context_iteration(context, TRUE);
+
+    return mbim_device_new_finish(result, error);
+}
+
+gboolean
+mbim_device_open_sync(MbimDevice *device,
+                      MbimDeviceOpenFlags open_flags,
+                     GMainContext *context,
+                     GError **error)
+{
+    g_autoptr(GMainContextPusher) pusher = NULL;
+    g_autoptr(GAsyncResult) result = NULL;
+
+    pusher = g_main_context_pusher_new(context);
+
+    mbim_device_open_full(device,
+                    open_flags,
+                    15,
+                    NULL,
+                    async_result_ready,
+                    &result);
+
+    while (!result)
+        g_main_context_iteration(context, TRUE);
+
+    return mbim_device_open_finish(device, result, error);
+}
+
+MbimMessage *
+mbim_device_command_sync(MbimDevice *device, GMainContext *context, MbimMessage *request, GError **error)
+{
+    g_autoptr(GMainContextPusher) pusher = NULL;
+    g_autoptr(GAsyncResult) result = NULL;
+
+    pusher = g_main_context_pusher_new(context);
+
+    mbim_device_command(device, request, 10, NULL, async_result_ready, &result);
+    mbim_message_unref(request);
+
+    while (result == NULL)
+        g_main_context_iteration(context, TRUE);
+
+    MbimMessage *response = mbim_device_command_finish(device, result, error);
+    if (!response) {
+        return NULL;
+    }
+
+    if (!mbim_message_response_get_result(response, MBIM_MESSAGE_TYPE_COMMAND_DONE, error)) {
+        return NULL;
+    }
+
+    return response;
+}
+
+gboolean
+mbim_device_close_sync(
+    MbimDevice *device,
+    GMainContext *context,
+    GError **error)
+{
+    g_autoptr(GMainContextPusher) pusher = NULL;
+    g_autoptr(GAsyncResult) result = NULL;
+
+    pusher = g_main_context_pusher_new(context);
+
+    mbim_device_close(device, 20, NULL, async_result_ready, &result);
+
+    while (result == NULL)
+        g_main_context_iteration(context, TRUE);
+
+    return mbim_device_close_finish(device, result, error);
+}

driver/apdu/mbim_helpers.h

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Frans Klaver <frans.klaver@vislink.com>
+ */
+#pragma once
+#include <libmbim-glib.h>
+
+MbimDevice *
+mbim_device_new_from_path(
+    GFile *file,
+    GMainContext *context,
+    GError **error);
+
+gboolean
+mbim_device_open_sync(
+    MbimDevice *device,
+    MbimDeviceOpenFlags open_flags,
+    GMainContext *context,
+    GError **error);
+
+gboolean
+mbim_device_close_sync(
+    MbimDevice *device,
+    GMainContext *context,
+    GError **error);
+
+MbimMessage *
+mbim_device_command_sync(
+    MbimDevice *device,
+    GMainContext *context,
+    MbimMessage *request,
+    GError **error);

driver/apdu/pcsc.c

@@ -7,6 +7,7 @@
 
 #ifdef _WIN32
 #include <winscard.h>
+#include "pcsc_win32.h"
 #else
 #include <PCSC/wintypes.h>
 #include <PCSC/winscard.h>
@@ -29,6 +30,10 @@ static SCARDCONTEXT pcsc_ctx;
 static SCARDHANDLE pcsc_hCard;
 static LPSTR pcsc_mszReaders;
 
+static void pcsc_error(const char *method, const int32_t code) {
+    fprintf(stderr, "%s failed: %08X (%s)\n", method, code, pcsc_stringify_error(code));
+}
+
 static int pcsc_ctx_open(void)
 {
     int ret;
@@ -41,7 +46,7 @@ static int pcsc_ctx_open(void)
     ret = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &pcsc_ctx);
     if (ret != SCARD_S_SUCCESS)
     {
-        fprintf(stderr, "SCardEstablishContext() failed: %08X\n", ret);
+        pcsc_error("SCardEstablishContext()", ret);
         return -1;
     }
 
@@ -54,7 +59,7 @@ static int pcsc_ctx_open(void)
     ret = SCardListReaders(pcsc_ctx, NULL, NULL, &dwReaders);
     if (ret != SCARD_S_SUCCESS)
     {
-        fprintf(stderr, "SCardListReaders() failed: %08X\n", ret);
+        pcsc_error("SCardListReaders()", ret);
         return -1;
     }
     pcsc_mszReaders = malloc(sizeof(char) * dwReaders);
@@ -67,7 +72,7 @@ static int pcsc_ctx_open(void)
 #endif
     if (ret != SCARD_S_SUCCESS)
     {
-        fprintf(stderr, "SCardListReaders() failed: %08X\n", ret);
+        pcsc_error("SCardListReaders()", ret);
         return -1;
     }
 
@@ -121,7 +126,7 @@ static int pcsc_open_hCard_iter(int index, const char *reader, void *userdata)
     ret = SCardConnect(pcsc_ctx, reader, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_T0, &pcsc_hCard, &dwActiveProtocol);
     if (ret != SCARD_S_SUCCESS)
     {
-        fprintf(stderr, "SCardConnect() failed: %08X\n", ret);
+        pcsc_error("SCardConnect()", ret);
         return -1;
     }
 
@@ -168,7 +173,7 @@ static int pcsc_transmit_lowlevel(uint8_t *rx, uint32_t *rx_len, const uint8_t *
     ret = SCardTransmit(pcsc_hCard, SCARD_PCI_T0, tx, tx_len, NULL, rx, &rx_len_merged);
     if (ret != SCARD_S_SUCCESS)
     {
-        fprintf(stderr, "SCardTransmit() failed: %08X\n", ret);
+        pcsc_error("SCardTransmit()", ret);
         return -1;
     }
 
@@ -453,7 +458,7 @@ static int libapduinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libapduinterface_fini(void)
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
 {
 }
 
@@ -462,5 +467,6 @@ const struct euicc_driver driver_apdu_pcsc = {
     .name = "pcsc",
     .init = (int (*)(void *))libapduinterface_init,
     .main = libapduinterface_main,
-    .fini = libapduinterface_fini,
+    .fini = (void (*)(void *))libapduinterface_fini,
 };
+

driver/apdu/pcsc_win32.c

@@ -0,0 +1,83 @@
+#ifdef _WIN32
+#include "pcsc_win32.h"
+
+#define PCSC_ERROR_CASE(NAME) case NAME: return #NAME
+
+const char *pcsc_stringify_error(const LONG err) {
+  switch (err) {
+    PCSC_ERROR_CASE(SCARD_S_SUCCESS);
+    PCSC_ERROR_CASE(SCARD_F_INTERNAL_ERROR);
+    PCSC_ERROR_CASE(SCARD_E_CANCELLED);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_HANDLE);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_PARAMETER);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_TARGET);
+    PCSC_ERROR_CASE(SCARD_E_NO_MEMORY);
+    PCSC_ERROR_CASE(SCARD_F_WAITED_TOO_LONG);
+    PCSC_ERROR_CASE(SCARD_E_INSUFFICIENT_BUFFER);
+    PCSC_ERROR_CASE(SCARD_E_UNKNOWN_READER);
+    PCSC_ERROR_CASE(SCARD_E_TIMEOUT);
+    PCSC_ERROR_CASE(SCARD_E_SHARING_VIOLATION);
+    PCSC_ERROR_CASE(SCARD_E_NO_SMARTCARD);
+    PCSC_ERROR_CASE(SCARD_E_UNKNOWN_CARD);
+    PCSC_ERROR_CASE(SCARD_E_CANT_DISPOSE);
+    PCSC_ERROR_CASE(SCARD_E_PROTO_MISMATCH);
+    PCSC_ERROR_CASE(SCARD_E_NOT_READY);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_VALUE);
+    PCSC_ERROR_CASE(SCARD_E_SYSTEM_CANCELLED);
+    PCSC_ERROR_CASE(SCARD_F_COMM_ERROR);
+    PCSC_ERROR_CASE(SCARD_F_UNKNOWN_ERROR);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_ATR);
+    PCSC_ERROR_CASE(SCARD_E_NOT_TRANSACTED);
+    PCSC_ERROR_CASE(SCARD_E_READER_UNAVAILABLE);
+    PCSC_ERROR_CASE(SCARD_P_SHUTDOWN);
+    PCSC_ERROR_CASE(SCARD_E_PCI_TOO_SMALL);
+    PCSC_ERROR_CASE(SCARD_E_READER_UNSUPPORTED);
+    PCSC_ERROR_CASE(SCARD_E_DUPLICATE_READER);
+    PCSC_ERROR_CASE(SCARD_E_CARD_UNSUPPORTED);
+    PCSC_ERROR_CASE(SCARD_E_NO_SERVICE);
+    PCSC_ERROR_CASE(SCARD_E_SERVICE_STOPPED);
+    PCSC_ERROR_CASE(SCARD_E_UNEXPECTED);
+    PCSC_ERROR_CASE(SCARD_E_ICC_INSTALLATION);
+    PCSC_ERROR_CASE(SCARD_E_ICC_CREATEORDER);
+    PCSC_ERROR_CASE(SCARD_E_UNSUPPORTED_FEATURE);
+    PCSC_ERROR_CASE(SCARD_E_DIR_NOT_FOUND);
+    PCSC_ERROR_CASE(SCARD_E_FILE_NOT_FOUND);
+    PCSC_ERROR_CASE(SCARD_E_NO_DIR);
+    PCSC_ERROR_CASE(SCARD_E_NO_FILE);
+    PCSC_ERROR_CASE(SCARD_E_NO_ACCESS);
+    PCSC_ERROR_CASE(SCARD_E_WRITE_TOO_MANY);
+    PCSC_ERROR_CASE(SCARD_E_BAD_SEEK);
+    PCSC_ERROR_CASE(SCARD_E_INVALID_CHV);
+    PCSC_ERROR_CASE(SCARD_E_UNKNOWN_RES_MNG);
+    PCSC_ERROR_CASE(SCARD_E_NO_SUCH_CERTIFICATE);
+    PCSC_ERROR_CASE(SCARD_E_CERTIFICATE_UNAVAILABLE);
+    PCSC_ERROR_CASE(SCARD_E_NO_READERS_AVAILABLE);
+    PCSC_ERROR_CASE(SCARD_E_COMM_DATA_LOST);
+    PCSC_ERROR_CASE(SCARD_E_NO_KEY_CONTAINER);
+    PCSC_ERROR_CASE(SCARD_E_SERVER_TOO_BUSY);
+    PCSC_ERROR_CASE(SCARD_E_PIN_CACHE_EXPIRED);
+    PCSC_ERROR_CASE(SCARD_E_NO_PIN_CACHE);
+    PCSC_ERROR_CASE(SCARD_E_READ_ONLY_CARD);
+    PCSC_ERROR_CASE(SCARD_W_UNSUPPORTED_CARD);
+    PCSC_ERROR_CASE(SCARD_W_UNRESPONSIVE_CARD);
+    PCSC_ERROR_CASE(SCARD_W_UNPOWERED_CARD);
+    PCSC_ERROR_CASE(SCARD_W_RESET_CARD);
+    PCSC_ERROR_CASE(SCARD_W_REMOVED_CARD);
+    PCSC_ERROR_CASE(SCARD_W_SECURITY_VIOLATION);
+    PCSC_ERROR_CASE(SCARD_W_WRONG_CHV);
+    PCSC_ERROR_CASE(SCARD_W_CHV_BLOCKED);
+    PCSC_ERROR_CASE(SCARD_W_EOF);
+    PCSC_ERROR_CASE(SCARD_W_CANCELLED_BY_USER);
+    PCSC_ERROR_CASE(SCARD_W_CARD_NOT_AUTHENTICATED);
+    PCSC_ERROR_CASE(SCARD_W_CACHE_ITEM_NOT_FOUND);
+    PCSC_ERROR_CASE(SCARD_W_CACHE_ITEM_STALE);
+    PCSC_ERROR_CASE(ERROR_IO_DEVICE);
+    PCSC_ERROR_CASE(ERROR_BROKEN_PIPE);
+    default:
+      return "Unknown error";
+  }
+}
+
+#undef PCSC_ERROR_CASE
+
+#endif

driver/apdu/pcsc_win32.h

@@ -0,0 +1,6 @@
+#pragma once
+#ifdef _WIN32
+#include <winscard.h>
+
+const char *pcsc_stringify_error(LONG);
+#endif

driver/apdu/qmi.c

@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Robert Marko <robert.marko@sartura.hr>
+ */
+#include "qmi.h"
+
+#include <stdio.h>
+#include "qmi_common.h"
+
+static int apdu_interface_connect(struct euicc_ctx *ctx)
+{
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    QmiDevice *device = NULL;
+    QmiClient *client = NULL;
+    const char *device_path;
+    GFile *file;
+
+    if (!(device_path = getenv("QMI_DEVICE"))) {
+        fprintf(stderr, "No QMI device path specified!\n");
+        return -1;
+    }
+    file = g_file_new_for_path(device_path);
+
+    qmi_priv->context = g_main_context_new();
+
+    device = qmi_device_new_from_path(file, qmi_priv->context, &error);
+    if (!device) {
+        fprintf(stderr, "error: create QMI device from path failed: %s\n", error->message);
+        return -1;
+    }
+
+    qmi_device_open_sync(device, QMI_DEVICE_OPEN_FLAGS_PROXY, qmi_priv->context, &error);
+    if (error) {
+        fprintf(stderr, "error: open QMI device failed: %s\n", error->message);
+        return -1;
+    }
+
+    client = qmi_device_allocate_client_sync(device, qmi_priv->context, &error);
+    if (!client) {
+        fprintf(stderr, "error: allocate QMI client failed: %s\n", error->message);
+        return -1;
+    }
+
+    qmi_priv->uimClient = QMI_CLIENT_UIM(client);
+
+    return 0;
+}
+
+static int libapduinterface_init(struct euicc_apdu_interface *ifstruct)
+{
+    struct qmi_data *qmi_priv;
+
+    qmi_priv = calloc(1, sizeof(struct qmi_data));
+    if(!qmi_priv) {
+        fprintf(stderr, "Failed allocating memory\n");
+        return -1;
+    }
+
+    memset(ifstruct, 0, sizeof(struct euicc_apdu_interface));
+    ifstruct->connect = apdu_interface_connect;
+    ifstruct->disconnect = qmi_apdu_interface_disconnect;
+    ifstruct->logic_channel_open = qmi_apdu_interface_logic_channel_open;
+    ifstruct->logic_channel_close = qmi_apdu_interface_logic_channel_close;
+    ifstruct->transmit = qmi_apdu_interface_transmit;
+
+    /*
+    * Allow the user to select the SIM card slot via environment variable.
+    * Use the primary SIM slot if not set.
+    */
+    if (getenv("UIM_SLOT"))
+        qmi_priv->uimSlot = atoi(getenv("UIM_SLOT"));
+    else
+        qmi_priv->uimSlot = 1;
+
+    ifstruct->userdata = qmi_priv;
+
+    return 0;
+}
+
+static int libapduinterface_main(int argc, char **argv)
+{
+    return 0;
+}
+
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
+{
+    struct qmi_data *qmi_priv = ifstruct->userdata;
+
+    qmi_cleanup(qmi_priv);
+
+    free(qmi_priv);
+}
+
+const struct euicc_driver driver_apdu_qmi = {
+    .type = DRIVER_APDU,
+    .name = "qmi",
+    .init = (int (*)(void *))libapduinterface_init,
+    .main = libapduinterface_main,
+    .fini = (void (*)(void *))libapduinterface_fini,
+};

driver/apdu/qmi.h

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Robert Marko <robert.marko@sartura.hr>
+ */
+#pragma once
+#include <driver.private.h>
+
+extern const struct euicc_driver driver_apdu_qmi;

driver/apdu/qmi_common.c

@@ -0,0 +1,163 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Luca Weiss <luca.weiss@fairphone.com>
+ */
+
+#include <stdio.h>
+
+#include "qmi_common.h"
+
+int qmi_apdu_interface_transmit(struct euicc_ctx *ctx, uint8_t **rx, uint32_t *rx_len, const uint8_t *tx, uint32_t tx_len)
+{
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    g_autoptr(GArray) apdu_data = NULL;
+
+    /* Convert tx into request GArray */
+    apdu_data = g_array_new(FALSE, FALSE, sizeof(guint8));
+    for (uint32_t i = 0; i < tx_len; i++)
+        g_array_append_val(apdu_data, tx[i]);
+
+    QmiMessageUimSendApduInput *input;
+    input = qmi_message_uim_send_apdu_input_new();
+    qmi_message_uim_send_apdu_input_set_slot(input, qmi_priv->uimSlot, NULL);
+    qmi_message_uim_send_apdu_input_set_channel_id(input, qmi_priv->lastChannelId, NULL);
+    qmi_message_uim_send_apdu_input_set_apdu(input, apdu_data, NULL);
+
+    QmiMessageUimSendApduOutput *output;
+    output = qmi_client_uim_send_apdu_sync(qmi_priv->uimClient, input, qmi_priv->context, &error);
+
+    qmi_message_uim_send_apdu_input_unref(input);
+
+    if (!qmi_message_uim_send_apdu_output_get_result(output, &error))
+    {
+        fprintf(stderr, "error: send apdu operation failed: %s\n", error->message);
+        return -1;
+    }
+
+    GArray *apdu_res = NULL;
+    if (!qmi_message_uim_send_apdu_output_get_apdu_response(output, &apdu_res, &error))
+    {
+        fprintf(stderr, "error: get apdu response operation failed: %s\n", error->message);
+        return -1;
+    }
+
+    /* Convert response GArray into rx */
+    *rx_len = apdu_res->len;
+    *rx = malloc(*rx_len);
+    if (!*rx)
+        return -1;
+    for (guint i = 0; i < apdu_res->len; i++)
+        (*rx)[i] = apdu_res->data[i];
+
+    qmi_message_uim_send_apdu_output_unref(output);
+
+    return 0;
+}
+
+int qmi_apdu_interface_logic_channel_open(struct euicc_ctx *ctx, const uint8_t *aid, uint8_t aid_len)
+{
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    guint8 channel_id;
+
+    GArray *aid_data = g_array_new(FALSE, FALSE, sizeof(guint8));
+    for (int i = 0; i < aid_len; i++)
+        g_array_append_val(aid_data, aid[i]);
+
+    QmiMessageUimOpenLogicalChannelInput *input;
+    input = qmi_message_uim_open_logical_channel_input_new();
+    qmi_message_uim_open_logical_channel_input_set_slot(input, qmi_priv->uimSlot, NULL);
+    qmi_message_uim_open_logical_channel_input_set_aid(input, aid_data, NULL);
+
+    QmiMessageUimOpenLogicalChannelOutput *output;
+    output = qmi_client_uim_open_logical_channel_sync(qmi_priv->uimClient, input, qmi_priv->context, &error);
+
+    qmi_message_uim_open_logical_channel_input_unref(input);
+    g_array_unref(aid_data);
+
+    if (!output)
+    {
+        fprintf(stderr, "error: send Open Logical Channel command failed: %s\n", error->message);
+        return -1;
+    }
+
+    if (!qmi_message_uim_open_logical_channel_output_get_result(output, &error))
+    {
+        fprintf(stderr, "error: open logical channel operation failed: %s\n", error->message);
+        return -1;
+    }
+
+    if (!qmi_message_uim_open_logical_channel_output_get_channel_id(output, &channel_id, &error))
+    {
+        fprintf(stderr, "error: get channel id operation failed: %s\n", error->message);
+        return -1;
+    }
+    qmi_priv->lastChannelId = channel_id;
+
+    g_debug("Opened logical channel with id %d", channel_id);
+
+    qmi_message_uim_open_logical_channel_output_unref(output);
+
+    return channel_id;
+}
+
+void qmi_apdu_interface_logic_channel_close(struct euicc_ctx *ctx, uint8_t channel)
+{
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+
+    QmiMessageUimLogicalChannelInput *input;
+    input = qmi_message_uim_logical_channel_input_new();
+    qmi_message_uim_logical_channel_input_set_slot(input, qmi_priv->uimSlot, NULL);
+    qmi_message_uim_logical_channel_input_set_channel_id(input, channel, NULL);
+
+    QmiMessageUimLogicalChannelOutput *output;
+    output = qmi_client_uim_logical_channel_sync(qmi_priv->uimClient, input, qmi_priv->context, &error);
+
+    qmi_message_uim_logical_channel_input_unref(input);
+
+    if (error)
+    {
+        fprintf(stderr, "error: send Close Logical Channel command failed: %s\n", error->message);
+        return;
+    }
+
+    if (!qmi_message_uim_logical_channel_output_get_result(output, &error))
+    {
+        fprintf(stderr, "error: logical channel operation failed: %s\n", error->message);
+        return;
+    }
+
+    /* Mark channel as having been cleaned up */
+    if (channel == qmi_priv->lastChannelId)
+        qmi_priv->lastChannelId = -1;
+
+    g_debug("Closed logical channel with id %d", channel);
+
+    qmi_message_uim_logical_channel_output_unref(output);
+}
+
+void qmi_apdu_interface_disconnect(struct euicc_ctx *ctx)
+{
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
+    g_autoptr(GError) error = NULL;
+    QmiClient *client = QMI_CLIENT(qmi_priv->uimClient);
+    QmiDevice *device = QMI_DEVICE(qmi_client_get_device(client));
+
+    qmi_device_release_client_sync(device, client, qmi_priv->context, &error);
+    qmi_priv->uimClient = NULL;
+
+    g_main_context_unref(qmi_priv->context);
+    qmi_priv->context = NULL;
+}
+
+void qmi_cleanup(struct qmi_data *qmi_priv)
+{
+    if (qmi_priv->lastChannelId > 0)
+    {
+        fprintf(stderr, "Cleaning up leaked APDU channel %d\n", qmi_priv->lastChannelId);
+        qmi_apdu_interface_logic_channel_close(NULL, qmi_priv->lastChannelId);
+        qmi_priv->lastChannelId = -1;
+    }
+}

driver/apdu/qmi_common.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2024, Luca Weiss <luca.weiss@fairphone.com>
+ */
+#pragma once
+#include <euicc/interface.h>
+#include <euicc/euicc.h>
+#include "qmi_helpers.h"
+
+struct qmi_data {
+	int lastChannelId;
+	int uimSlot;
+	GMainContext *context;
+	QmiClientUim *uimClient;
+};
+
+int qmi_apdu_interface_transmit(struct euicc_ctx *ctx, uint8_t **rx, uint32_t *rx_len, const uint8_t *tx, uint32_t tx_len);
+int qmi_apdu_interface_logic_channel_open(struct euicc_ctx *ctx, const uint8_t *aid, uint8_t aid_len);
+void qmi_apdu_interface_logic_channel_close(struct euicc_ctx *ctx, uint8_t channel);
+void qmi_apdu_interface_disconnect(struct euicc_ctx *ctx);
+void qmi_cleanup(struct qmi_data *qmi_priv);

driver/apdu/qmi_helpers.c

@@ -3,7 +3,7 @@
  * Copyright (c) 2024, Luca Weiss <luca.weiss@fairphone.com>
  */
 
-#include "qmi_qrtr_helpers.h"
+#include "qmi_helpers.h"
 
 static void
 async_result_ready(GObject *source_object,
@@ -16,6 +16,7 @@ async_result_ready(GObject *source_object,
     *result_out = g_object_ref(res);
 }
 
+#ifdef LPAC_WITH_APDU_QMI_QRTR
 QrtrBus *
 qrtr_bus_new_sync(GMainContext *context,
                   GError **error)
@@ -56,9 +57,37 @@ qmi_device_new_from_node_sync(QrtrNode *node,
 
     return qmi_device_new_from_node_finish(result, error);
 }
+#endif
+
+#ifdef LPAC_WITH_APDU_QMI
+QmiDevice *
+qmi_device_new_from_path(GFile *file,
+                         GMainContext *context,
+                         GError **error)
+{
+    g_autoptr(GMainContextPusher) pusher = NULL;
+    g_autoptr(GAsyncResult) result = NULL;
+    g_autofree gchar *id = NULL;
+
+    pusher = g_main_context_pusher_new(context);
+
+    id = g_file_get_path (file);
+    if (id)
+        qmi_device_new(file,
+                       NULL,
+                       async_result_ready,
+                       &result);
+
+    while (result == NULL)
+        g_main_context_iteration(context, TRUE);
+
+    return qmi_device_new_finish(result, error);
+}
+#endif
 
 gboolean
 qmi_device_open_sync(QmiDevice *device,
+                     QmiDeviceOpenFlags flags,
                      GMainContext *context,
                      GError **error)
 {
@@ -68,7 +97,7 @@ qmi_device_open_sync(QmiDevice *device,
     pusher = g_main_context_pusher_new(context);
 
     qmi_device_open(device,
-                    QMI_DEVICE_OPEN_FLAGS_NONE,
+                    flags,
                     15,
                     NULL,
                     async_result_ready,

driver/apdu/qmi_helpers.h

@@ -2,10 +2,12 @@
 /*
  * Copyright (c) 2024, Luca Weiss <luca.weiss@fairphone.com>
  */
-
+#pragma once
-#include <libqrtr-glib.h>
 #include <libqmi-glib.h>
 
+#ifdef LPAC_WITH_APDU_QMI_QRTR
+#include <libqrtr-glib.h>
+
 QrtrBus *qrtr_bus_new_sync(
     GMainContext *context,
     GError **error);
@@ -15,10 +17,20 @@ qmi_device_new_from_node_sync(
     QrtrNode *node,
     GMainContext *context,
     GError **error);
+#endif
+
+#ifdef LPAC_WITH_APDU_QMI
+QmiDevice *
+qmi_device_new_from_path(
+    GFile *file,
+    GMainContext *context,
+    GError **error);
+#endif
 
 gboolean
 qmi_device_open_sync(
     QmiDevice *device,
+    QmiDeviceOpenFlags flags,
     GMainContext *context,
     GError **error);
 

driver/apdu/qmi_qrtr.c

@@ -11,25 +11,22 @@
 #include <string.h>
 #include <stdbool.h>
 #include <libqrtr-glib.h>
-#include "qmi_qrtr_helpers.h"
+#include "qmi_common.h"
 
-static int lastChannelId = -1;
-static int uimSlot = -1;
-static GMainContext *context = NULL;
 static QrtrBus *bus = NULL;
-static QmiClientUim *uimClient = NULL;
 
 static int apdu_interface_connect(struct euicc_ctx *ctx)
 {
+    struct qmi_data *qmi_priv = ctx->apdu.interface->userdata;
     g_autoptr(GError) error = NULL;
     QrtrNode *node = NULL;
     QmiDevice *device = NULL;
     QmiClient *client = NULL;
     bool found = false;
 
-    context = g_main_context_new();
+    qmi_priv->context = g_main_context_new();
 
-    bus = qrtr_bus_new_sync(context, &error);
+    bus = qrtr_bus_new_sync(qmi_priv->context, &error);
     if (bus == NULL)
     {
         fprintf(stderr, "error: connect to QRTR bus failed: %s\n", error->message);
@@ -54,202 +51,49 @@ static int apdu_interface_connect(struct euicc_ctx *ctx)
         return -1;
     }
 
-    device = qmi_device_new_from_node_sync(node, context, &error);
+    device = qmi_device_new_from_node_sync(node, qmi_priv->context, &error);
     if (!device)
     {
         fprintf(stderr, "error: create QMI device from QRTR node failed: %s\n", error->message);
         return -1;
     }
 
-    qmi_device_open_sync(device, context, &error);
+    qmi_device_open_sync(device, QMI_DEVICE_OPEN_FLAGS_NONE, qmi_priv->context, &error);
     if (error)
     {
         fprintf(stderr, "error: open QMI device failed: %s\n", error->message);
         return -1;
     }
 
-    client = qmi_device_allocate_client_sync(device, context, &error);
+    client = qmi_device_allocate_client_sync(device, qmi_priv->context, &error);
     if (!client)
     {
         fprintf(stderr, "error: allocate QMI client failed: %s\n", error->message);
         return -1;
     }
 
-    uimClient = QMI_CLIENT_UIM(client);
+    qmi_priv->uimClient = QMI_CLIENT_UIM(client);
 
     return 0;
 }
 
-static void apdu_interface_disconnect(struct euicc_ctx *ctx)
-{
-    g_autoptr(GError) error = NULL;
-    QmiClient *client = QMI_CLIENT(uimClient);
-    QmiDevice *device = QMI_DEVICE(qmi_client_get_device(client));
-
-    qmi_device_release_client_sync(device, client, context, &error);
-    uimClient = NULL;
-
-    g_main_context_unref(context);
-    context = NULL;
-}
-
-static int apdu_interface_transmit(struct euicc_ctx *ctx, uint8_t **rx, uint32_t *rx_len, const uint8_t *tx, uint32_t tx_len)
-{
-    g_autoptr(GError) error = NULL;
-    g_autoptr(GArray) apdu_data = NULL;
-
-    /* Convert tx into request GArray */
-    apdu_data = g_array_new(FALSE, FALSE, sizeof(guint8));
-    for (uint32_t i = 0; i < tx_len; i++)
-        g_array_append_val(apdu_data, tx[i]);
-
-    QmiMessageUimSendApduInput *input;
-    input = qmi_message_uim_send_apdu_input_new();
-    qmi_message_uim_send_apdu_input_set_slot(input, uimSlot, NULL);
-    qmi_message_uim_send_apdu_input_set_channel_id(input, lastChannelId, NULL);
-    qmi_message_uim_send_apdu_input_set_apdu(input, apdu_data, NULL);
-
-    QmiMessageUimSendApduOutput *output;
-    output = qmi_client_uim_send_apdu_sync(uimClient, input, context, &error);
-
-    qmi_message_uim_send_apdu_input_unref(input);
-
-    if (!qmi_message_uim_send_apdu_output_get_result(output, &error))
-    {
-        fprintf(stderr, "error: send apdu operation failed: %s\n", error->message);
-        return -1;
-    }
-
-    GArray *apdu_res = NULL;
-    if (!qmi_message_uim_send_apdu_output_get_apdu_response(output, &apdu_res, &error))
-    {
-        fprintf(stderr, "error: get apdu response operation failed: %s\n", error->message);
-        return -1;
-    }
-
-    /* Convert response GArray into rx */
-    *rx_len = apdu_res->len;
-    *rx = malloc(*rx_len);
-    if (!*rx)
-        return -1;
-    for (guint i = 0; i < apdu_res->len; i++)
-        (*rx)[i] = apdu_res->data[i];
-
-    qmi_message_uim_send_apdu_output_unref(output);
-
-    return 0;
-}
-
-static int apdu_interface_logic_channel_open(struct euicc_ctx *ctx, const uint8_t *aid, uint8_t aid_len)
-{
-    g_autoptr(GError) error = NULL;
-    guint8 channel_id;
-
-    GArray *aid_data = g_array_new(FALSE, FALSE, sizeof(guint8));
-    for (int i = 0; i < aid_len; i++)
-        g_array_append_val(aid_data, aid[i]);
-
-    QmiMessageUimOpenLogicalChannelInput *input;
-    input = qmi_message_uim_open_logical_channel_input_new();
-    qmi_message_uim_open_logical_channel_input_set_slot(input, uimSlot, NULL);
-    qmi_message_uim_open_logical_channel_input_set_aid(input, aid_data, NULL);
-
-    QmiMessageUimOpenLogicalChannelOutput *output;
-    output = qmi_client_uim_open_logical_channel_sync(uimClient, input, context, &error);
-
-    qmi_message_uim_open_logical_channel_input_unref(input);
-    g_array_unref(aid_data);
-
-    if (!output)
-    {
-        fprintf(stderr, "error: send Open Logical Channel command failed: %s\n", error->message);
-        return -1;
-    }
-
-    if (!qmi_message_uim_open_logical_channel_output_get_result(output, &error))
-    {
-        fprintf(stderr, "error: open logical channel operation failed: %s\n", error->message);
-        return -1;
-    }
-
-    if (!qmi_message_uim_open_logical_channel_output_get_channel_id(output, &channel_id, &error))
-    {
-        fprintf(stderr, "error: get channel id operation failed: %s\n", error->message);
-        return -1;
-    }
-    lastChannelId = channel_id;
-
-    g_debug("Opened logical channel with id %d", channel_id);
-
-    qmi_message_uim_open_logical_channel_output_unref(output);
-
-    return channel_id;
-}
-
-static void apdu_interface_logic_channel_close(struct euicc_ctx *ctx, uint8_t channel)
-{
-    g_autoptr(GError) error = NULL;
-
-    QmiMessageUimLogicalChannelInput *input;
-    input = qmi_message_uim_logical_channel_input_new();
-    qmi_message_uim_logical_channel_input_set_slot(input, uimSlot, NULL);
-    qmi_message_uim_logical_channel_input_set_channel_id(input, channel, NULL);
-
-    QmiMessageUimLogicalChannelOutput *output;
-    output = qmi_client_uim_logical_channel_sync(uimClient, input, context, &error);
-
-    qmi_message_uim_logical_channel_input_unref(input);
-
-    if (error)
-    {
-        fprintf(stderr, "error: send Close Logical Channel command failed: %s\n", error->message);
-        return;
-    }
-
-    if (!qmi_message_uim_logical_channel_output_get_result(output, &error))
-    {
-        fprintf(stderr, "error: logical channel operation failed: %s\n", error->message);
-        return;
-    }
-
-    /* Mark channel as having been cleaned up */
-    if (channel == lastChannelId)
-        lastChannelId = -1;
-
-    g_debug("Closed logical channel with id %d", channel);
-
-    qmi_message_uim_logical_channel_output_unref(output);
-}
-
-static void cleanup(void)
-{
-    if (lastChannelId != -1)
-    {
-        fprintf(stderr, "Cleaning up leaked APDU channel %d\n", lastChannelId);
-        apdu_interface_logic_channel_close(NULL, lastChannelId);
-        lastChannelId = -1;
-    }
-}
-
-static void sighandler(int sig)
-{
-    // This triggers atexit() hooks and therefore call cleanup()
-    exit(0);
-}
-
 static int libapduinterface_init(struct euicc_apdu_interface *ifstruct)
 {
+    struct qmi_data *qmi_priv;
+
+    qmi_priv = malloc(sizeof(struct qmi_data));
+    if(!qmi_priv) {
+        fprintf(stderr, "Failed allocating memory\n");
+        return -1;
+    }
+
     memset(ifstruct, 0, sizeof(struct euicc_apdu_interface));
 
     ifstruct->connect = apdu_interface_connect;
-    ifstruct->disconnect = apdu_interface_disconnect;
+    ifstruct->disconnect = qmi_apdu_interface_disconnect;
-    ifstruct->logic_channel_open = apdu_interface_logic_channel_open;
+    ifstruct->logic_channel_open = qmi_apdu_interface_logic_channel_open;
-    ifstruct->logic_channel_close = apdu_interface_logic_channel_close;
+    ifstruct->logic_channel_close = qmi_apdu_interface_logic_channel_close;
-    ifstruct->transmit = apdu_interface_transmit;
+    ifstruct->transmit = qmi_apdu_interface_transmit;
-
-    // Install cleanup routine
-    atexit(cleanup);
-    signal(SIGINT, sighandler);
 
     /*
      * Allow the user to select the SIM card slot via environment variable.
@@ -257,13 +101,15 @@ static int libapduinterface_init(struct euicc_apdu_interface *ifstruct)
      */
     if (getenv("UIM_SLOT"))
     {
-        uimSlot = atoi(getenv("UIM_SLOT"));
+        qmi_priv->uimSlot = atoi(getenv("UIM_SLOT"));
     }
     else
     {
-        uimSlot = 1;
+        qmi_priv->uimSlot = 1;
     }
 
+    ifstruct->userdata = qmi_priv;
+
     return 0;
 }
 
@@ -272,8 +118,13 @@ static int libapduinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libapduinterface_fini(void)
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
 {
+    struct qmi_data *qmi_priv = ifstruct->userdata;
+
+    qmi_cleanup(qmi_priv);
+
+    free(qmi_priv);
 }
 
 const struct euicc_driver driver_apdu_qmi_qrtr = {
@@ -281,5 +132,5 @@ const struct euicc_driver driver_apdu_qmi_qrtr = {
     .name = "qmi_qrtr",
     .init = (int (*)(void *))libapduinterface_init,
     .main = libapduinterface_main,
-    .fini = libapduinterface_fini,
+    .fini = (void (*)(void *))libapduinterface_fini,
 };

driver/apdu/stdio.c

@@ -43,7 +43,7 @@ static int afgets(char **obuf, FILE *fp)
         }
     }
 
-    (*obuf)[strcspn(*obuf, "\r\n")] = 0;
+    (*obuf)[strcspn(*obuf, "\n")] = 0;
 
     return 0;
 
@@ -87,7 +87,7 @@ static int json_print(cJSON *jpayload)
     }
     cJSON_Delete(jroot);
 
-    fprintf(stdout, "%s\r\n", jstr);
+    fprintf(stdout, "%s\n", jstr);
     fflush(stdout);
 
     free(jstr);
@@ -340,7 +340,7 @@ static int libapduinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libapduinterface_fini(void)
+static void libapduinterface_fini(struct euicc_apdu_interface *ifstruct)
 {
 }
 
@@ -349,5 +349,5 @@ const struct euicc_driver driver_apdu_stdio = {
     .name = "stdio",
     .init = (int (*)(void *))libapduinterface_init,
     .main = libapduinterface_main,
-    .fini = libapduinterface_fini,
+    .fini = (void (*)(void *))libapduinterface_fini,
 };

driver/driver.c

@@ -8,6 +8,14 @@
 #include "driver/apdu/gbinder_hidl.h"
 #endif
 
+#ifdef LPAC_WITH_APDU_MBIM
+#include "driver/apdu/mbim.h"
+#endif
+
+#ifdef LPAC_WITH_APDU_QMI
+#include "driver/apdu/qmi.h"
+#endif
+
 #ifdef LPAC_WITH_APDU_QMI_QRTR
 #include "driver/apdu/qmi_qrtr.h"
 #endif
@@ -28,6 +36,12 @@ static const struct euicc_driver *drivers[] = {
 #ifdef LPAC_WITH_APDU_GBINDER
     &driver_apdu_gbinder_hidl,
 #endif
+#ifdef LPAC_WITH_APDU_MBIM
+    &driver_apdu_mbim,
+#endif
+#ifdef LPAC_WITH_APDU_QMI
+    &driver_apdu_qmi,
+#endif
 #ifdef LPAC_WITH_APDU_QMI_QRTR
     &driver_apdu_qmi_qrtr,
 #endif
@@ -112,10 +126,10 @@ void euicc_driver_fini()
 {
     if (_driver_apdu != NULL)
     {
-        _driver_apdu->fini();
+        _driver_apdu->fini(&euicc_driver_interface_apdu);
     }
     if (_driver_http != NULL)
     {
-        _driver_http->fini();
+        _driver_http->fini(&euicc_driver_interface_http);
     }
 }

driver/driver.private.h

@@ -12,5 +12,5 @@ struct euicc_driver
     const char *name;
     int (*init)(void *interface);
     int (*main)(int argc, char **argv);
-    void (*fini)(void);
+    void (*fini)(void *interface);
 };

driver/http/curl.c

@@ -192,7 +192,7 @@ static int libhttpinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libhttpinterface_fini(void)
+static void libhttpinterface_fini(struct euicc_http_interface *ifstruct)
 {
 }
 
@@ -201,5 +201,5 @@ const struct euicc_driver driver_http_curl = {
     .name = "curl",
     .init = (int (*)(void *))libhttpinterface_init,
     .main = libhttpinterface_main,
-    .fini = libhttpinterface_fini,
+    .fini = (void (*)(void *))libhttpinterface_fini,
 };

driver/http/stdio.c

@@ -43,7 +43,7 @@ static int afgets(char **obuf, FILE *fp)
         }
     }
 
-    (*obuf)[strcspn(*obuf, "\r\n")] = 0;
+    (*obuf)[strcspn(*obuf, "\n")] = 0;
 
     return 0;
 
@@ -87,7 +87,7 @@ static int json_print(cJSON *jpayload)
     }
     cJSON_Delete(jroot);
 
-    fprintf(stdout, "%s\r\n", jstr);
+    fprintf(stdout, "%s\n", jstr);
     fflush(stdout);
 
     free(jstr);
@@ -272,7 +272,7 @@ static int libhttpinterface_main(int argc, char **argv)
     return 0;
 }
 
-static void libhttpinterface_fini(void)
+static void libhttpinterface_fini(struct euicc_http_interface *ifstruct)
 {
 }
 
@@ -281,5 +281,5 @@ const struct euicc_driver driver_http_stdio = {
     .name = "stdio",
     .init = (int (*)(void *))libhttpinterface_init,
     .main = libhttpinterface_main,
-    .fini = libhttpinterface_fini,
+    .fini = (void (*)(void *))libhttpinterface_fini,
 };

euicc/CMakeLists.txt

@@ -16,6 +16,10 @@ if(LPAC_DYNAMIC_LIBEUICC)
         endif()
     endforeach()
     set_target_properties(euicc PROPERTIES PUBLIC_HEADER "${ALL_HEADERS}")
+    # Only useful on Windows, and will lead to invalid arguments on ld.gold.
+    if(WIN32)
+        set_target_properties(euicc PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+    endif()
     # Install a pkg-config file
     configure_file(libeuicc.pc.in libeuicc.pc @ONLY)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libeuicc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

euicc/base64.c

@@ -67,7 +67,7 @@ int euicc_base64_decode(unsigned char *bufplain, const char *bufcoded)
         nprbytes -= 4;
     }
 
-    /* Note: (nprbytes == 1) would be an error, so just ingore that case */
+    /* Note: (nprbytes == 1) would be an error, so just ignore that case */
     if (nprbytes > 1)
     {
         *(bufout++) =

euicc/es10b.c

@@ -745,7 +745,7 @@ int es10b_cancel_session_r(struct euicc_ctx *ctx, char **b64_CancelSessionRespon
     int fret = 0;
     struct euicc_derutil_node n_request, n_transactionId, n_reason;
     uint8_t reason_buf[sizeof(enum es10b_cancel_session_reason)];
-    uint32_t reason_buf_len;
+    uint32_t reason_buf_len = sizeof(reason_buf);
     uint32_t reqlen;
     uint8_t *respbuf = NULL;
     unsigned resplen;
@@ -767,6 +767,7 @@ int es10b_cancel_session_r(struct euicc_ctx *ctx, char **b64_CancelSessionRespon
     n_transactionId.tag = 0x80;
     n_transactionId.value = (const uint8_t *)param->transactionId;
     n_transactionId.length = param->transactionIdLen;
+    n_transactionId.pack.next = &n_reason;
 
     n_reason.tag = 0x81;
     n_reason.value = reason_buf;

euicc/es8p.c

@@ -0,0 +1,158 @@
+#include "es8p.h"
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "derutil.h"
+#include "hexutil.h"
+#include "base64.h"
+
+int es8p_metadata_parse(struct es8p_metadata **stru_metadata, const char *b64_Metadata)
+{
+    int ret;
+    uint8_t *metadata = NULL;
+    int metadata_len = 0;
+    struct euicc_derutil_node n_metadata, n_iter;
+    struct es8p_metadata *p = NULL;
+
+    *stru_metadata = NULL;
+
+    memset(&n_metadata, 0x00, sizeof(n_metadata));
+    memset(&n_iter, 0x00, sizeof(n_iter));
+
+    metadata = malloc(euicc_base64_decode_len(b64_Metadata));
+    if (!metadata)
+    {
+        goto err;
+    }
+
+    if ((metadata_len = euicc_base64_decode(metadata, b64_Metadata)) < 0)
+    {
+        goto err;
+    }
+
+    if (euicc_derutil_unpack_find_tag(&n_metadata, 0xBF25, metadata, metadata_len) < 0)
+    {
+        goto err;
+    }
+
+    if (!(p = malloc(sizeof(struct es8p_metadata))))
+    {
+        goto err;
+    }
+
+    memset(p, 0, sizeof(*p));
+
+    n_iter.self.ptr = n_metadata.value;
+    n_iter.self.length = 0;
+
+    p->profileClass = ES10C_PROFILE_CLASS_NULL;
+    p->iconType = ES10C_ICON_TYPE_NULL;
+
+    while (euicc_derutil_unpack_next(&n_iter, &n_iter, n_metadata.value, n_metadata.length) == 0)
+    {
+        int tmplong;
+        switch (n_iter.tag)
+        {
+        case 0x5A:
+            euicc_hexutil_bin2gsmbcd(p->iccid, sizeof(p->iccid), n_iter.value, n_iter.length);
+            break;
+        case 0x91:
+            p->serviceProviderName = malloc(n_iter.length + 1);
+            if (p->serviceProviderName)
+            {
+                memcpy(p->serviceProviderName, n_iter.value, n_iter.length);
+                p->serviceProviderName[n_iter.length] = '\0';
+            }
+            break;
+        case 0x92:
+            p->profileName = malloc(n_iter.length + 1);
+            if (p->profileName)
+            {
+                memcpy(p->profileName, n_iter.value, n_iter.length);
+                p->profileName[n_iter.length] = '\0';
+            }
+            break;
+        case 0x93:
+            tmplong = euicc_derutil_convert_bin2long(n_iter.value, n_iter.length);
+            switch (tmplong)
+            {
+            case ES10C_ICON_TYPE_JPEG:
+            case ES10C_ICON_TYPE_PNG:
+                p->iconType = tmplong;
+                break;
+            default:
+                p->iconType = ES10C_ICON_TYPE_UNDEFINED;
+                break;
+            }
+            break;
+        case 0x94:
+            p->icon = malloc(euicc_base64_encode_len(n_iter.length));
+            if (p->icon)
+            {
+                euicc_base64_encode(p->icon, n_iter.value, n_iter.length);
+            }
+            break;
+        case 0x95:
+            tmplong = euicc_derutil_convert_bin2long(n_iter.value, n_iter.length);
+            switch (tmplong)
+            {
+            case ES10C_PROFILE_CLASS_TEST:
+            case ES10C_PROFILE_CLASS_PROVISIONING:
+            case ES10C_PROFILE_CLASS_OPERATIONAL:
+                p->profileClass = tmplong;
+                break;
+            default:
+                p->profileClass = ES10C_PROFILE_CLASS_UNDEFINED;
+                break;
+            }
+            break;
+        case 0xB6:
+        case 0xB7:
+        case 0x99:
+            // fprintf(stderr, "\n[PLEASE REPORT][TODO][TAG %02X]: ", n_iter.tag);
+            // for (uint32_t i = 0; i < n_iter.self.length; i++)
+            // {
+            //     fprintf(stderr, "%02X ", n_iter.self.ptr[i]);
+            // }
+            // fprintf(stderr, "\n");
+            break;
+        }
+    }
+
+    *stru_metadata = p;
+    ret = 0;
+    goto exit;
+
+err:
+    ret = -1;
+    free(*stru_metadata);
+    *stru_metadata = NULL;
+    free(p);
+    p = NULL;
+exit:
+    free(metadata);
+    metadata = NULL;
+
+    return ret;
+}
+
+void es8p_metadata_free(struct es8p_metadata **stru_metadata)
+{
+    struct es8p_metadata *p = *stru_metadata;
+
+    if (p == NULL)
+    {
+        return;
+    }
+
+    free(p->serviceProviderName);
+    free(p->profileName);
+    free(p->icon);
+    free(p);
+
+    *stru_metadata = NULL;
+}

euicc/es8p.h

@@ -0,0 +1,32 @@
+#pragma once
+#include "euicc.h"
+#include "es10c.h"
+
+struct es8p_metadata
+{
+    char iccid[(10 * 2) + 1];
+    char *serviceProviderName;
+    char *profileName;
+    enum es10c_icon_type iconType;
+    char *icon;
+    enum es10c_profile_class profileClass;
+    struct
+    {
+        char **profileManagementOperation;
+        char *notificationAddress;
+    } notificationConfigurationInfo;
+    struct
+    {
+        char *mccmnc;
+        char *gid1;
+        char *gid2;
+    } profileOwner;
+    struct
+    {
+        char *dpOid;
+    } dpProprietaryData;
+    char **profilePolicyRules;
+};
+
+int es8p_metadata_parse(struct es8p_metadata **metadata, const char *b64_Metadata);
+void es8p_metadata_free(struct es8p_metadata **stru_metadata);

euicc/euicc.c

@@ -99,9 +99,9 @@ int es10x_command_iter(struct euicc_ctx *ctx, const uint8_t *der_req, unsigned r
     while (req_len)
     {
         uint8_t rlen;
-        if (req_len > 120)
+        if (req_len > ctx->es10x_mss)
         {
-            rlen = 120;
+            rlen = ctx->es10x_mss;
             ret = es10x_command_buildrequest_continue(ctx, reqseq, &req, req_ptr, rlen);
         }
         else
@@ -172,15 +172,27 @@ int euicc_init(struct euicc_ctx *ctx)
 {
     int ret;
 
+    if (ctx->aid == NULL)
+    {
+        ctx->aid = (const uint8_t *)ISD_R_AID;
+        ctx->aid_len = sizeof(ISD_R_AID) - 1;
+    }
+
+    if (ctx->es10x_mss == 0)
+    {
+        ctx->es10x_mss = 120;
+    }
+
     ret = ctx->apdu.interface->connect(ctx);
     if (ret < 0)
     {
         return -1;
     }
 
-    ret = ctx->apdu.interface->logic_channel_open(ctx, (const uint8_t *)ISD_R_AID, sizeof(ISD_R_AID) - 1);
+    ret = ctx->apdu.interface->logic_channel_open(ctx, ctx->aid, ctx->aid_len);
     if (ret < 0)
     {
+        ctx->apdu.interface->disconnect(ctx);
         return -1;
     }
 

euicc/euicc.h

@@ -6,6 +6,9 @@
 
 struct euicc_ctx
 {
+    const uint8_t *aid;
+    uint8_t aid_len;
+    uint8_t es10x_mss;
     struct
     {
         const struct euicc_apdu_interface *interface;

scripts/build-ci.sh

@@ -1,66 +1,32 @@
 #!/bin/bash
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+
+source "$SCRIPT_DIR/functions.sh"
+
 set -euo pipefail
-WORKSPACE="$(pwd)"
-KERNEL="$(uname -s)"
-MATCHINE="$(uname -m)"
-CURL_VERSION="8.6.0_1"
-WOA_TOOLCHAIN_VERSION="2024-02-08"
-MINGW_CURL_WIN64_BLOB="https://curl.se/windows/dl-$CURL_VERSION/curl-$CURL_VERSION-win64-mingw.zip"
-MINGW_CURL_WIN64A_BLOB="https://curl.se/windows/dl-$CURL_VERSION/curl-$CURL_VERSION-win64a-mingw.zip"
-MINGW32_TOOLCHAIN_BLOB="https://github.com/Windows-on-ARM-Experiments/mingw-woarm64-build/releases/download/$WOA_TOOLCHAIN_VERSION/aarch64-w64-mingw32-msvcrt-toolchain.tar.gz"
-
-case "$KERNEL" in
-Linux)
-    KERNEL="linux"
-    ;;
-Darwin)
-    KERNEL="darwin"
-    MATCHINE="universal"
-    ;;
-esac
-
-function download {
-    URL="$1"
-    SAVED_PATH="$(mktemp)"
-    SAVED_DIR="$(mktemp -d)"
-    wget --no-verbose "$URL" -O "$SAVED_PATH"
-    case "$URL" in
-    *.zip)
-        unzip -q -d "$SAVED_DIR" "$SAVED_PATH"
-        rm "$SAVED_PATH"
-        echo "$SAVED_DIR"
-        ;;
-    *.tar.gz)
-        tar -C "$SAVED_DIR" --gzip --extract --file="$SAVED_PATH"
-        rm "$SAVED_PATH"
-        echo "$SAVED_DIR"
-        ;;
-    *)
-        echo "$SAVED_PATH"
-        ;;
-    esac
-}
-
-set -x
 
 BUILD="$(mktemp -d)"
-cd "$BUILD" || exit 1
-
 ARTIFACT="$WORKSPACE/build"
 
-mkdir "$BUILD/output"
+cd "$BUILD" || exit 1
-[ -d "$ARTIFACT" ] || mkdir "$ARTIFACT"
 
-cp "$WORKSPACE/src/LICENSE" "$BUILD/output/lpac-LICENSE"
+mkdir -p "$BUILD/output"
-cp "$WORKSPACE/euicc/LICENSE" "$BUILD/output/libeuicc-LICENSE"
+mkdir -p "$ARTIFACT"
-cp "$WORKSPACE/cjson/LICENSE" "$BUILD/output/cjson-LICENSE"
-cp "$WORKSPACE/dlfcn-win32/LICENSE" "$BUILD/output/dlfcn-win32-LICENSE"
 
 case "${1:-}" in
 make)
     cmake "$WORKSPACE"
     make -j
-    zip -r -j "$ARTIFACT/lpac-$KERNEL-$MATCHINE.zip" output/*
+    copy-license "$BUILD/output"
+    copy-usage "$BUILD/output"
+    create-bundle "$ARTIFACT/lpac-$KERNEL-$MATCHINE.zip" "$BUILD/output"
+    ;;
+make-without-lto)
+    cmake -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF "$WORKSPACE"
+    make -j
+    copy-license "$BUILD/output"
+    copy-usage "$BUILD/output"
+    create-bundle "$ARTIFACT/lpac-$KERNEL-$MATCHINE-without-lto.zip" "$BUILD/output"
     ;;
 debian)
     cmake "$WORKSPACE" -DCPACK_GENERATOR=DEB
@@ -70,27 +36,28 @@ debian)
 mingw)
     cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64.cmake
     make -j
-    CURL="$(download "$MINGW_CURL_WIN64_BLOB")"
+    copy-license "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/bin/libcurl-x64.dll output/libcurl.dll
+    copy-curl-win "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/COPYING.txt output/libcurl-LICENSE
+    copy-usage "$BUILD/output"
-    zip -r -j "$ARTIFACT/lpac-windows-x86_64-mingw.zip" output/*
+    create-bundle "$ARTIFACT/lpac-windows-x86_64-mingw.zip" "$BUILD/output"
     ;;
 woa-mingw)
     TOOLCHAIN="$(download "$MINGW32_TOOLCHAIN_BLOB")"
     cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64-woa.cmake "-DTOOLCHAIN_BIN_PATH=$TOOLCHAIN/bin"
     make -j
-    CURL="$(download "$MINGW_CURL_WIN64A_BLOB")"
+    rm -rf "$TOOLCHAIN"
-    cp "$CURL"/curl-*-mingw/bin/libcurl-arm64.dll output/libcurl.dll
+    copy-license "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/COPYING.txt output/libcurl-LICENSE
+    copy-curl-woa "$BUILD/output"
-    zip -r -j "$ARTIFACT/lpac-windows-arm64-mingw.zip" output/*
+    copy-usage "$BUILD/output"
+    create-bundle "$ARTIFACT/lpac-windows-arm64-mingw.zip" "$BUILD/output"
     ;;
 woa-zig)
     cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/aarch64-windows-zig.cmake
     make -j
-    CURL="$(download "$MINGW_CURL_WIN64A_BLOB")"
+    copy-license "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/bin/libcurl-arm64.dll output/libcurl.dll
+    copy-curl-woa "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/COPYING.txt output/libcurl-LICENSE
+    copy-usage "$BUILD/output"
-    zip -r -j "$ARTIFACT/lpac-windows-arm64-zig.zip" output/*
+    create-bundle "$ARTIFACT/lpac-windows-arm64-zig.zip" "$BUILD/output"
     ;;
 *)
     echo "Usage: $0 {make,debian,mingw,woa-mingw,woa-zig}"

scripts/build-woa.sh

@@ -1,59 +1,28 @@
 #!/bin/bash
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+
+source "$SCRIPT_DIR/functions.sh"
+
 set -euo pipefail
-WORKSPACE="$(pwd)"
-CURL_VERSION="8.6.0_1"
-WOA_TOOLCHAIN_VERSION="2024-02-08"
-MINGW_CURL_WIN64A_BLOB="https://curl.se/windows/dl-$CURL_VERSION/curl-$CURL_VERSION-win64a-mingw.zip"
-MINGW32_TOOLCHAIN_BLOB="https://github.com/Windows-on-ARM-Experiments/mingw-woarm64-build/releases/download/$WOA_TOOLCHAIN_VERSION/aarch64-w64-mingw32-msvcrt-toolchain.tar.gz"
-
-function download {
-    URL="$1"
-    SAVED_PATH="$(mktemp)"
-    SAVED_DIR="$(mktemp -d)"
-    wget --no-verbose "$URL" -O "$SAVED_PATH"
-    case "$URL" in
-    *.zip)
-        unzip -q -d "$SAVED_DIR" "$SAVED_PATH"
-        rm "$SAVED_PATH"
-        echo "$SAVED_DIR"
-        ;;
-    *.tar.gz)
-        tar -C "$SAVED_DIR" --gzip --extract --file="$SAVED_PATH"
-        rm "$SAVED_PATH"
-        echo "$SAVED_DIR"
-        ;;
-    *)
-        echo "$SAVED_PATH"
-        ;;
-    esac
-}
-
-set -x
 
 BUILD="$(mktemp -d)"
 cd "$BUILD" || exit 1
 
-mkdir "$BUILD/output"
-cp "$WORKSPACE/src/LICENSE" output/lpac-LICENSE
-cp "$WORKSPACE/euicc/LICENSE" output/libeuicc-LICENSE
-cp "$WORKSPACE/cjson/LICENSE" output/cjson-LICENSE
-cp "$WORKSPACE/dlfcn-win32/LICENSE" output/dlfcn-win32-LICENSE
-
 case "${1:-}" in
 mingw)
     TOOLCHAIN="$(download "$MINGW32_TOOLCHAIN_BLOB")"
     cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64-woa.cmake "-DTOOLCHAIN_BIN_PATH=$TOOLCHAIN/bin"
     make -j
-    CURL="$(download "$MINGW_CURL_WIN64A_BLOB")"
+    copy-license "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/bin/libcurl-arm64.dll output/libcurl.dll
+    copy-curl-woa "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/COPYING.txt output/libcurl-LICENSE
+    copy-usage "$BUILD/output"
     ;;
 zig)
     cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/aarch64-windows-zig.cmake
     make -j
-    CURL="$(download "$MINGW_CURL_WIN64A_BLOB")"
+    copy-license "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/bin/libcurl-arm64.dll output/libcurl.dll
+    copy-curl-woa "$BUILD/output"
-    cp "$CURL"/curl-*-mingw/COPYING.txt output/libcurl-LICENSE
+    copy-usage "$BUILD/output"
     ;;
 *)
     echo "Usage: $0 {mingw,zig}"

scripts/functions.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+export KERNEL="$(uname -s)"
+export MATCHINE="$(uname -m)"
+
+export WORKSPACE="${GITHUB_WORKSPACE:-$(pwd)}"
+export CURL_VERSION="8.6.0_1"
+export WOA_TOOLCHAIN_VERSION="2024-02-08"
+export MINGW_CURL_WIN64_BLOB="https://curl.se/windows/dl-$CURL_VERSION/curl-$CURL_VERSION-win64-mingw.zip"
+export MINGW_CURL_WIN64A_BLOB="https://curl.se/windows/dl-$CURL_VERSION/curl-$CURL_VERSION-win64a-mingw.zip"
+export MINGW32_TOOLCHAIN_BLOB="https://github.com/Windows-on-ARM-Experiments/mingw-woarm64-build/releases/download/$WOA_TOOLCHAIN_VERSION/aarch64-w64-mingw32-msvcrt-toolchain.tar.gz"
+
+case "$KERNEL" in
+Linux)
+    KERNEL="linux"
+    ;;
+Darwin)
+    KERNEL="darwin"
+    MATCHINE="universal"
+    ;;
+esac
+
+function download {
+    local URL="$1"
+    local SAVED_PATH="$(mktemp)"
+    local SAVED_DIR="$(mktemp -d)"
+    wget --no-verbose "$URL" -O "$SAVED_PATH"
+    case "$URL" in
+    *.zip)
+        unzip -q -d "$SAVED_DIR" "$SAVED_PATH"
+        rm "$SAVED_PATH"
+        echo "$SAVED_DIR"
+        ;;
+    *.tar.gz)
+        tar -C "$SAVED_DIR" --gzip --extract --file="$SAVED_PATH"
+        rm "$SAVED_PATH"
+        echo "$SAVED_DIR"
+        ;;
+    *)
+        echo "$SAVED_PATH"
+        ;;
+    esac
+}
+
+function copy-license {
+    local OUTPUT="$1"
+
+    cp "$WORKSPACE/src/LICENSE" "$OUTPUT/LICENSE-lpac"
+    cp "$WORKSPACE/euicc/LICENSE" "$OUTPUT/LICENSE-libeuicc"
+    cp "$WORKSPACE/cjson/LICENSE" "$OUTPUT/LICENSE-cjson"
+    cp "$WORKSPACE/dlfcn-win32/LICENSE" "$OUTPUT/LICENSE-dlfcn-win32"
+}
+
+function copy-curl-woa {
+    local OUTPUT="$1"
+
+    CURL="$(download "$MINGW_CURL_WIN64A_BLOB")"
+    cp "$CURL"/curl-*-mingw/bin/libcurl-arm64.dll "$OUTPUT/libcurl.dll"
+    cp "$CURL"/curl-*-mingw/COPYING.txt "$OUTPUT/LICENSE-libcurl"
+    rm -rf "$CURL"
+}
+
+function copy-curl-win {
+    local OUTPUT="$1"
+
+    CURL="$(download "$MINGW_CURL_WIN64_BLOB")"
+    cp "$CURL"/curl-*-mingw/bin/libcurl-x64.dll "$OUTPUT/libcurl.dll"
+    cp "$CURL"/curl-*-mingw/COPYING.txt "$OUTPUT/LICENSE-libcurl"
+    rm -rf "$CURL"
+}
+
+function copy-usage {
+    local OUTPUT="$1"
+
+    cp "$WORKSPACE/docs/USAGE.md" "$OUTPUT/README.md"
+}
+
+function create-bundle {
+    local BUNDLE_FILE="$1"
+    local INPUT_DIR="$2"
+
+    pushd "$INPUT_DIR"
+    zip -r "$BUNDLE_FILE" *
+    popd
+}

scripts/setup-debian.sh

@@ -1,4 +1,13 @@
 #!/bin/bash
-set -xeuo pipefail
+set -euo pipefail
-sudo apt-get update
+export DEBIAN_FRONTEND=noninteractive
-sudo apt-get install -y build-essential libpcsclite-dev libcurl4-openssl-dev gcc-mingw-w64 g++-mingw-w64 zip
+export DEBIAN_PRIORITY=critical
+
+apt-get -qq -o=Dpkg::Use-Pty=0 update
+apt-get -qq -o=Dpkg::Use-Pty=0 install -y build-essential libpcsclite-dev libcurl4-openssl-dev zip
+
+case "${1:-}" in
+mingw)
+    apt-get -qq -o=Dpkg::Use-Pty=0 install gcc-mingw-w64 g++-mingw-w64
+    ;;
+esac

src/CMakeLists.txt

@@ -21,7 +21,7 @@ add_custom_target(version
     -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
     -D DST=${CMAKE_CURRENT_SOURCE_DIR}/version.h
     -D GIT_EXECUTABLE=${GIT_EXECUTABLE}
-    -P ${CMAKE_MODULE_PATH}/git-version.cmake
+    -P ${LPAC_CMAKE_MODULE_PATH}/git-version.cmake
 )
 add_dependencies(lpac version)
 set_target_properties(lpac PROPERTIES

src/applet/chip.c

@@ -17,9 +17,10 @@ static const struct applet_entry *applets[] = {
     NULL,
 };
 
-static int applet_main(int argc, char **argv)
+static int applet_main(const int argc, char **argv)
 {
-    main_init_euicc();
+    const int ret = main_init_euicc();
+    if (ret != 0) return ret;
     return applet_entry(argc, argv, applets);
 }
 

src/applet/notification.c

@@ -17,9 +17,10 @@ static const struct applet_entry *applets[] = {
     NULL,
 };
 
-static int applet_main(int argc, char **argv)
+static int applet_main(const int argc, char **argv)
 {
-    main_init_euicc();
+    const int ret = main_init_euicc();
+    if (ret != 0) return ret;
     return applet_entry(argc, argv, applets);
 }
 

src/applet/notification/process.c

@@ -67,10 +67,9 @@ static int applet_main(int argc, char **argv)
     int fret = 0;
     int all = 0;
     int autoremove = 0;
-    int argc_seq_offset = 1;
+    int opt = 0;
 
-    int opt = getopt(argc, argv, opt_string);
+    while ((opt = getopt(argc, argv, opt_string)) != -1)
-    for (int i = 0; opt != -1; i++)
     {
         switch (opt)
         {
@@ -82,19 +81,15 @@ static int applet_main(int argc, char **argv)
             break;
         case 'h':
         case '?':
-            printf("Usage: %s [OPTIONS] [seqNumber_0] [seqNumber_1]...\r\n", argv[0]);
+            printf("Usage: %s [OPTIONS] [seqNumber_0] [seqNumber_1]...\n", argv[0]);
-            printf("\t -a All notifications\r\n");
+            printf("\t -a All notifications\n");
-            printf("\t -r Automatically remove processed notifications\r\n");
+            printf("\t -r Automatically remove processed notifications\n");
             return -1;
         default:
-            goto run;
             break;
         }
-        argc_seq_offset++;
-        opt = getopt(argc, argv, opt_string);
     }
 
-run:
     if (all)
     {
         struct es10b_notification_metadata_list *notifications, *rptr;
@@ -121,13 +116,17 @@ run:
     }
     else
     {
-        for (int i = argc_seq_offset; i < argc; i++)
+        for (int i = optind; i < argc; i++)
         {
             unsigned long seqNumber;
 
             errno = 0;
-            seqNumber = strtoul(argv[i], NULL, 10);
+            char *str_end;
-            if (errno != 0)
+            seqNumber = strtoul(argv[i], &str_end, 10);
+            // Although POSIX said user should check errno instead of return value,
+            // but errno may not be set when no conversion is performed according to C99.
+            // Check nptr is same as str_end to ensure there is no conversion.
+            if ((seqNumber == 0 && strcmp(argv[i], str_end)) || errno != 0)
             {
                 continue;
             }

src/applet/notification/remove.c

@@ -41,10 +41,9 @@ static int applet_main(int argc, char **argv)
 
     int fret = 0;
     int all = 0;
-    int argc_seq_offset = 1;
+    int opt = 0;
 
-    int opt = getopt(argc, argv, opt_string);
+    while ((opt = getopt(argc, argv, opt_string)) != -1)
-    for (int i = 0; opt != -1; i++)
     {
         switch (opt)
         {
@@ -53,18 +52,14 @@ static int applet_main(int argc, char **argv)
             break;
         case 'h':
         case '?':
-            printf("Usage: %s [OPTIONS] [seqNumber_0] [seqNumber_1]...\r\n", argv[0]);
+            printf("Usage: %s [OPTIONS] [seqNumber_0] [seqNumber_1]...\n", argv[0]);
-            printf("\t -a All notifications\r\n");
+            printf("\t -a All notifications\n");
             return -1;
         default:
-            goto run;
             break;
         }
-        argc_seq_offset++;
-        opt = getopt(argc, argv, opt_string);
     }
 
-run:
     if (all)
     {
         struct es10b_notification_metadata_list *notifications, *rptr;
@@ -91,13 +86,17 @@ run:
     }
     else
     {
-        for (int i = argc_seq_offset; i < argc; i++)
+        for (int i = optind; i < argc; i++)
         {
             unsigned long seqNumber;
 
             errno = 0;
-            seqNumber = strtoul(argv[i], NULL, 10);
+            char *str_end;
-            if (errno != 0)
+            seqNumber = strtoul(argv[i], &str_end, 10);
+            // Although POSIX said user should check errno instead of return value,
+            // but errno may not be set when no conversion is performed according to C99.
+            // Check nptr is same as str_end to ensure there is no conversion.
+            if ((seqNumber == 0 && strcmp(argv[i], str_end)) || errno != 0)
             {
                 continue;
             }

src/applet/profile.c

@@ -25,9 +25,10 @@ static const struct applet_entry *applets[] = {
     NULL,
 };
 
-static int applet_main(int argc, char **argv)
+static int applet_main(const int argc, char **argv)
 {
-    main_init_euicc();
+    const int ret = main_init_euicc();
+    if (ret != 0) return ret;
     return applet_entry(argc, argv, applets);
 }
 

src/applet/profile/discovery.c

@@ -24,8 +24,7 @@ static int applet_main(int argc, char **argv)
 
     cJSON *jdata = NULL;
 
-    opt = getopt(argc, argv, opt_string);
+    while ((opt = getopt(argc, argv, opt_string)) != -1)
-    while (opt != -1)
     {
         switch (opt)
         {
@@ -37,10 +36,10 @@ static int applet_main(int argc, char **argv)
             break;
         case 'h':
         case '?':
-            printf("Usage: %s [OPTIONS]\r\n", argv[0]);
+            printf("Usage: %s [OPTIONS]\n", argv[0]);
-            printf("\t -s SM-DS Domain\r\n");
+            printf("\t -s SM-DS Domain\n");
-            printf("\t -i IMEI\r\n");
+            printf("\t -i IMEI\n");
-            printf("\t -h This help info\r\n");
+            printf("\t -h This help info\n");
             return -1;
             break;
         }

src/applet/profile/download.c

@@ -5,17 +5,48 @@
 #include <string.h>
 #include <getopt.h>
 #include <main.h>
+#include <signal.h>
 
 #include <euicc/es10a.h>
 #include <euicc/es10b.h>
 #include <euicc/es9p.h>
+#include <euicc/es8p.h>
 #include <euicc/tostr.h>
 
-static const char *opt_string = "s:m:i:c:a:h?";
+static const char *opt_string = "s:m:i:c:a:ph?";
+
+static volatile int cancelled = 0;
+
+#define CANCELPOINT() \
+    if (cancelled)    \
+    {                 \
+        goto err;     \
+    }
+
+#ifdef _WIN32
+// https://stackoverflow.com/a/58244503
+char *strsep(char **stringp, const char *__delim) {
+    char *rv = *stringp;
+    if (!rv) return rv;
+    *stringp += strcspn(*stringp, __delim);
+    if (**stringp)
+        *(*stringp)++ = '\0';
+    else
+        *stringp = 0;
+    return rv;
+}
+#endif
+
+static void sigint_handler(int x)
+{
+    cancelled = 1;
+}
 
 static int applet_main(int argc, char **argv)
 {
     int fret;
+    const char *error_function_name = NULL;
+    const char *error_detail = NULL;
 
     int opt;
 
@@ -24,12 +55,15 @@ static int applet_main(int argc, char **argv)
     char *imei = NULL;
     char *confirmation_code = NULL;
     char *activation_code = NULL;
+    int interactive_preview = 0;
 
     struct es10a_euicc_configured_addresses configured_addresses = {0};
     struct es10b_load_bound_profile_package_result download_result = {0};
 
-    opt = getopt(argc, argv, opt_string);
+    cJSON *jmetadata = NULL;
-    while (opt != -1)
+    struct es8p_metadata *profile_metadata = NULL;
+
+    while ((opt = getopt(argc, argv, opt_string)) != -1)
     {
         switch (opt)
         {
@@ -52,20 +86,23 @@ static int applet_main(int argc, char **argv)
                 activation_code += 4; // ignore uri scheme
             }
             break;
+        case 'p':
+            interactive_preview = 1;
+            break;
         case 'h':
         case '?':
-            printf("Usage: %s [OPTIONS]\r\n", argv[0]);
+            printf("Usage: %s [OPTIONS]\n", argv[0]);
-            printf("\t -s SM-DP+ Domain\r\n");
+            printf("\t -s SM-DP+ Domain\n");
-            printf("\t -m Matching ID\r\n");
+            printf("\t -m Matching ID\n");
-            printf("\t -i IMEI\r\n");
+            printf("\t -i IMEI\n");
-            printf("\t -c Confirmation Code (Password)\r\n");
+            printf("\t -c Confirmation Code (Password)\n");
-            printf("\t -a Activation Code (e.g: 'LPA:***')\r\n");
+            printf("\t -a Activation Code (e.g: 'LPA:***')\n");
-            printf("\t -h This help info\r\n");
+            printf("\t -p Interactive preview profile\n");
+            printf("\t -h This help info\n");
             return -1;
         default:
             break;
         }
-        opt = getopt(argc, argv, opt_string);
     }
 
     if (activation_code != NULL)
@@ -73,17 +110,18 @@ static int applet_main(int argc, char **argv)
         // SGP.22 v2.2.2; Page 111
         // Section: 4.1 (Activation Code)
 
-        char *token = NULL;
+        const char *token = NULL;
         int index = 0;
 
-        for (token = strtok(activation_code, "$"); token != NULL; token = strtok(NULL, "$"))
+        while ((token = strsep(&activation_code, "$")) != NULL)
         {
             switch (index)
             {
             case 0: // Activation Code Format
                 if (strncmp(token, "1", strlen(token)) != 0)
                 {
-                    jprint_error("invalid activation code format", NULL);
+                    error_function_name = "activation_code";
+                    error_detail = "invalid";
                     goto err;
                 }
                 break;
@@ -99,7 +137,8 @@ static int applet_main(int argc, char **argv)
             case 4: // Confirmation Code Required Flag
                 if (strncmp(token, "1", strlen(token)) == 0 && confirmation_code == NULL)
                 {
-                    jprint_error("confirmation code required", NULL);
+                    error_function_name = "confirmation_code";
+                    error_detail = "required";
                     goto err;
                 }
                 break;
@@ -115,7 +154,8 @@ static int applet_main(int argc, char **argv)
         jprint_progress("es10a_get_euicc_configured_addresses", NULL);
         if (es10a_get_euicc_configured_addresses(&euicc_ctx, &configured_addresses))
         {
-            jprint_error("es10a_get_euicc_configured_addresses", NULL);
+            error_function_name = "es10a_get_euicc_configured_addresses";
+            error_detail = NULL;
             goto err;
         }
         else
@@ -126,60 +166,113 @@ static int applet_main(int argc, char **argv)
 
     if (!smdp || (strlen(smdp) == 0))
     {
-        jprint_error("smdp is null", NULL);
+        error_function_name = "smdp";
+        error_detail = "empty";
         goto err;
     }
 
+    signal(SIGINT, sigint_handler);
+
     euicc_ctx.http.server_address = smdp;
 
+    CANCELPOINT();
     jprint_progress("es10b_get_euicc_challenge_and_info", smdp);
     if (es10b_get_euicc_challenge_and_info(&euicc_ctx))
     {
-        jprint_error("es10b_get_euicc_challenge_and_info", NULL);
+        error_function_name = "es10b_get_euicc_challenge_and_info";
+        error_detail = NULL;
         goto err;
     }
 
+    CANCELPOINT();
     jprint_progress("es9p_initiate_authentication", smdp);
     if (es9p_initiate_authentication(&euicc_ctx))
     {
-        jprint_error("es9p_initiate_authentication", euicc_ctx.http.status.message);
+        error_function_name = "es9p_initiate_authentication";
+        error_detail = euicc_ctx.http.status.message;
         goto err;
     }
 
+    CANCELPOINT();
     jprint_progress("es10b_authenticate_server", smdp);
     if (es10b_authenticate_server(&euicc_ctx, matchingId, imei))
     {
-        jprint_error("es10b_authenticate_server", NULL);
+        error_function_name = "es10b_authenticate_server";
+        error_detail = NULL;
         goto err;
     }
 
+    CANCELPOINT();
     jprint_progress("es9p_authenticate_client", smdp);
     if (es9p_authenticate_client(&euicc_ctx))
     {
-        jprint_error("es9p_authenticate_client", euicc_ctx.http.status.message);
+        error_function_name = "es9p_authenticate_client";
+        error_detail = euicc_ctx.http.status.message;
         goto err;
     }
 
+    // preview here
+    if (euicc_ctx.http._internal.prepare_download_param->b64_profileMetadata)
+    {
+        CANCELPOINT();
+        if (es8p_metadata_parse(&profile_metadata, euicc_ctx.http._internal.prepare_download_param->b64_profileMetadata))
+        {
+            error_function_name = "es8p_meatadata_parse";
+            error_detail = NULL;
+            goto err;
+        }
+
+        jmetadata = cJSON_CreateObject();
+
+        cJSON_AddStringOrNullToObject(jmetadata, "iccid", profile_metadata->iccid);
+        cJSON_AddStringOrNullToObject(jmetadata, "serviceProviderName", profile_metadata->serviceProviderName);
+        cJSON_AddStringOrNullToObject(jmetadata, "profileName", profile_metadata->profileName);
+        cJSON_AddStringOrNullToObject(jmetadata, "iconType", euicc_icontype2str(profile_metadata->iconType));
+        cJSON_AddStringOrNullToObject(jmetadata, "icon", profile_metadata->icon);
+        cJSON_AddStringOrNullToObject(jmetadata, "profileClass", euicc_profileclass2str(profile_metadata->profileClass));
+
+        jprint_progress_obj("es8p_meatadata_parse", jmetadata);
+
+        if (interactive_preview)
+        {
+            char c;
+            jprint_progress("preview", "y/n");
+            c = getchar();
+            if (c != 'y' && c != 'Y')
+            {
+                cancelled = 1;
+            }
+        }
+    }
+
+    CANCELPOINT();
     jprint_progress("es10b_prepare_download", smdp);
     if (es10b_prepare_download(&euicc_ctx, confirmation_code))
     {
-        jprint_error("es10b_prepare_download", NULL);
+        error_function_name = "es10b_prepare_download";
+        error_detail = NULL;
         goto err;
     }
 
+    CANCELPOINT();
     jprint_progress("es9p_get_bound_profile_package", smdp);
     if (es9p_get_bound_profile_package(&euicc_ctx))
     {
-        jprint_error("es9p_get_bound_profile_package", euicc_ctx.http.status.message);
+        error_function_name = "es9p_get_bound_profile_package";
+        error_detail = euicc_ctx.http.status.message;
         goto err;
     }
 
+    CANCELPOINT();
     jprint_progress("es10b_load_bound_profile_package", smdp);
     if (es10b_load_bound_profile_package(&euicc_ctx, &download_result))
     {
         char buffer[256];
+
         snprintf(buffer, sizeof(buffer), "%s,%s", euicc_bppcommandid2str(download_result.bppCommandId), euicc_errorreason2str(download_result.errorReason));
-        jprint_error("es10b_load_bound_profile_package", buffer);
+        error_function_name = "es10b_load_bound_profile_package";
+        error_detail = buffer;
+
         goto err;
     }
 
@@ -190,7 +283,25 @@ static int applet_main(int argc, char **argv)
 
 err:
     fret = -1;
+    if (error_detail)
+    {
+        error_detail = strdup(error_detail);
+    }
+    jprint_progress("es10b_cancel_session", smdp);
+    es10b_cancel_session(&euicc_ctx, ES10B_CANCEL_SESSION_REASON_ENDUSERREJECTION);
+    jprint_progress("es9p_cancel_session", smdp);
+    es9p_cancel_session(&euicc_ctx);
+    if (!cancelled)
+    {
+        jprint_error(error_function_name, error_detail);
+    }
+    else
+    {
+        jprint_error("cancelled", NULL);
+    }
+    free((void *)error_detail);
 exit:
+    es8p_metadata_free(&profile_metadata);
     es10a_euicc_configured_addresses_free(&configured_addresses);
     euicc_http_cleanup(&euicc_ctx);
     return fret;

src/jprint.c

@@ -26,7 +26,7 @@ void jprint_error(const char *function_name, const char *detail)
     jstr = cJSON_PrintUnformatted(jroot);
     cJSON_Delete(jroot);
 
-    printf("%s\r\n", jstr);
+    printf("%s\n", jstr);
     fflush(stdout);
     free(jstr);
 }
@@ -48,7 +48,36 @@ void jprint_progress(const char *function_name, const char *detail)
     jstr = cJSON_PrintUnformatted(jroot);
     cJSON_Delete(jroot);
 
-    printf("%s\r\n", jstr);
+    printf("%s\n", jstr);
+    fflush(stdout);
+    free(jstr);
+}
+
+void jprint_progress_obj(const char *function_name, cJSON *jdata)
+{
+    cJSON *jroot = NULL;
+    cJSON *jpayload = NULL;
+    char *jstr = NULL;
+
+    jroot = cJSON_CreateObject();
+    cJSON_AddStringOrNullToObject(jroot, "type", "progress");
+    jpayload = cJSON_CreateObject();
+    cJSON_AddNumberToObject(jpayload, "code", 0);
+    cJSON_AddStringOrNullToObject(jpayload, "message", function_name);
+    if (jdata)
+    {
+        cJSON_AddItemToObject(jpayload, "data", jdata);
+    }
+    else
+    {
+        cJSON_AddNullToObject(jpayload, "data");
+    }
+    cJSON_AddItemToObject(jroot, "payload", jpayload);
+
+    jstr = cJSON_PrintUnformatted(jroot);
+    cJSON_Delete(jroot);
+
+    printf("%s\n", jstr);
     fflush(stdout);
     free(jstr);
 }
@@ -77,7 +106,7 @@ void jprint_success(cJSON *jdata)
     jstr = cJSON_PrintUnformatted(jroot);
     cJSON_Delete(jroot);
 
-    printf("%s\r\n", jstr);
+    printf("%s\n", jstr);
     fflush(stdout);
     free(jstr);
 }

src/jprint.h

@@ -3,4 +3,5 @@
 
 void jprint_error(const char *function_name, const char *detail);
 void jprint_progress(const char *function_name, const char *detail);
+void jprint_progress_obj(const char *function_name, cJSON *jdata);
 void jprint_success(cJSON *jdata);

src/main.c

@@ -6,6 +6,7 @@
 #include <time.h>
 
 #include <euicc/interface.h>
+#include <euicc/hexutil.h>
 #include <euicc/euicc.h>
 #include <driver.h>
 
@@ -23,7 +24,17 @@
 #include <processenv.h>
 #endif
 
-static int driver_applet_main(int argc, char **argv)
+#define ENV_ISD_R_AID "LPAC_CUSTOM_ISD_R_AID"
+#define ISD_R_AID_MAX_LENGTH 16
+
+#define ENV_ES10X_MSS "LPAC_CUSTOM_ES10X_MSS"
+#define ES10X_MSS_MIN_VALUE 6
+#define ES10X_MSS_MAX_VALUE 255
+
+#define ENV_APDU_DRIVER "LPAC_APDU"
+#define ENV_HTTP_DRIVER "LPAC_HTTP"
+
+static int driver_applet_main(const int argc, char **argv)
 {
     const struct applet_entry *applets[] = {
         &(struct applet_entry){
@@ -56,14 +67,56 @@ static const struct applet_entry *applets[] = {
 static int euicc_ctx_inited = 0;
 struct euicc_ctx euicc_ctx = {0};
 
-void main_init_euicc()
+static int setup_aid(const uint8_t **aid, uint8_t *aid_len) {
+    *aid = NULL;
+    *aid_len = 0;
+
+    const char *value = getenv(ENV_ISD_R_AID);
+    if (value == NULL) return 0;
+
+    uint8_t *parsed = malloc(ISD_R_AID_MAX_LENGTH);
+    const int n = euicc_hexutil_hex2bin(parsed, ISD_R_AID_MAX_LENGTH, value);
+    if (n < 1) return -1;
+
+    *aid = parsed;
+    *aid_len = n;
+    return 0;
+}
+
+static int setup_mss(uint8_t *mss) {
+    *mss = 0;
+
+    const char *value = getenv(ENV_ES10X_MSS);
+    if (value == NULL) return 0;
+
+    const long parsed = strtol(value, NULL, 10);
+    if (parsed == 0) return 0;
+    if (parsed < ES10X_MSS_MIN_VALUE) return -1;
+    if (parsed > ES10X_MSS_MAX_VALUE) return -1;
+
+    *mss = (uint8_t) parsed;
+    return 0;
+}
+
+int main_init_euicc()
 {
+    if (setup_aid(&euicc_ctx.aid, &euicc_ctx.aid_len))
+    {
+        jprint_error("euicc_init", "invalid custom ISD-R applet id given");
+        return -1;
+    }
+    if (setup_mss(&euicc_ctx.es10x_mss))
+    {
+        jprint_error("euicc_init", "invalid custom ES10x MSS given");
+        return -1;
+    }
     if (euicc_init(&euicc_ctx))
     {
         jprint_error("euicc_init", NULL);
-        exit(-1);
+        return -1;
     }
     euicc_ctx_inited = 1;
+    return 0;
 }
 
 void main_fini_euicc()
@@ -106,10 +159,24 @@ static char **warg_to_arg(const int wargc, wchar_t **wargv)
 int main(int argc, char **argv)
 {
     int ret = 0;
+    const char *apdu_driver;
+    const char *http_driver;
 
     memset(&euicc_ctx, 0, sizeof(euicc_ctx));
 
-    if (euicc_driver_init(getenv("LPAC_APDU"), getenv("LPAC_HTTP")))
+    apdu_driver = getenv(ENV_APDU_DRIVER);
+    if (apdu_driver == NULL)
+    {
+        apdu_driver = "pcsc";
+    }
+
+    http_driver = getenv(ENV_HTTP_DRIVER);
+    if (http_driver == NULL)
+    {
+        http_driver = "curl";
+    }
+
+    if (euicc_driver_init(apdu_driver, http_driver))
     {
         return -1;
     }

src/main.h

@@ -5,5 +5,5 @@
 
 extern struct euicc_ctx euicc_ctx;
 
-void main_init_euicc(void);
+int main_init_euicc(void);
 void main_fini_euicc(void);

src/rlpa-server.php

@@ -1,655 +0,0 @@
-<?php
-
-class ShellMode extends RLPAWorkMode
-{
-    private function lpacPrompt()
-    {
-        while (fread(STDIN, 128));
-        echo "lpac> ";
-    }
-
-    public function start($data)
-    {
-        $this->lpacPrompt();
-    }
-
-    public function onStdin($data)
-    {
-        $cmd = trim($data);
-        if ($cmd == "exit") {
-            throw new Exception();
-        }
-        $this->client->processOpenLpac($cmd);
-    }
-
-    public function onProcessFinished($data)
-    {
-        if ($data === null) {
-            throw new Exception();
-        }
-
-        print_r($data);
-        $this->lpacPrompt();
-    }
-
-    public function finished()
-    {
-        return false;
-    }
-
-    static public function requireStdin()
-    {
-        return true;
-    }
-}
-
-class ProcessNotificationMode extends RLPAWorkMode
-{
-    private $state = 0;
-    private $notifications = [];
-    private $failed_count = 0;
-
-    public function start($data)
-    {
-        $this->state = 0;
-        $this->client->processOpenLpac("notification list");
-    }
-
-    private function processOneNotification()
-    {
-        $notification = array_shift($this->notifications);
-        if ($notification == null) {
-            if ($this->failed_count) {
-                $this->client->messageBox("{$this->failed_count} notifications failed to process, please retry.");
-            } else {
-                $this->client->messageBox("All notifications processed successfully.");
-            }
-            $this->state = 2;
-            return;
-        }
-
-        echo "Processing: seqNumber: {$notification['seqNumber']}, profileManagementOperation: {$notification['profileManagementOperation']}" . PHP_EOL;
-
-        switch ($notification['profileManagementOperation']) {
-            case 'install':
-            case 'enable':
-            case 'disable':
-                $this->client->processOpenLpac("notification process {$notification['seqNumber']} -r");
-                break;
-            case 'delete':
-                $this->client->processOpenLpac("notification process {$notification['seqNumber']}");
-                break;
-            default:
-                throw new Exception();
-        }
-    }
-
-    public function onProcessFinished($data)
-    {
-        if ($data === null) {
-            throw new Exception();
-        }
-
-        switch ($this->state) {
-            case 0:
-                if ($data['code'] !== 0) {
-                    throw new Exception();
-                }
-                $this->notifications = $data['data'] ?? [];
-                $this->state = 1;
-                $this->processOneNotification();
-                break;
-            case 1:
-                if ($data['code'] == 0) {
-                    echo "Process success" . PHP_EOL;
-                } else {
-                    echo "Process failed" . PHP_EOL;
-                    $this->failed_count++;
-                }
-                $this->processOneNotification();
-                break;
-        }
-    }
-
-    public function finished()
-    {
-        return ($this->state == 2);
-    }
-
-    static public function requireStdin()
-    {
-        return false;
-    }
-}
-
-class DownloadProfileMode extends RLPAWorkMode
-{
-    private $state = 0;
-
-    public function start($data)
-    {
-        $this->state = 0;
-        $data = ltrim($data, "LPA:");
-        $data = explode(chr(0x02), $data); // GSM-8bit will convert $ to \x02
-
-        print_r($data);
-
-        if ($data[0] != "1") {
-            $this->client->messageBox("Invalid format: version mismatch");
-            throw new Exception();
-        }
-
-        if (!isset($data[1])) {
-            $this->client->messageBox("Invalid format: missing SM-DP+");
-            throw new Exception();
-        }
-
-        $cmd = 'profile download -s ' . escapeshellarg($data[1]);
-        if (isset($data[2])) {
-            $cmd .= ' -m ' . escapeshellarg($data[2]);
-        }
-
-        $this->client->processOpenLpac($cmd);
-    }
-
-    public function onProcessFinished($data)
-    {
-        if ($data === null) {
-            throw new Exception();
-        }
-
-        if ($data['code'] == 0) {
-            echo 'Download success' . PHP_EOL;
-            $this->client->messageBox('Download success');
-        } else {
-            print_r($data);
-            echo 'Download failed' . PHP_EOL;
-            $this->client->messageBox('Download failed');
-            $this->client->messageBox($data['message']);
-            $this->client->messageBox($data['data']);
-        }
-
-        $this->state = 1;
-    }
-
-    public function finished()
-    {
-        return ($this->state == 1);
-    }
-
-    static public function requireStdin()
-    {
-        return false;
-    }
-}
-
-class RLPAClient
-{
-    private static $stdin_lock = false;
-
-    private $name;
-    private $shutdown;
-    private $socket;
-    private $packet;
-
-    private $process;
-    private $process_stdin;
-    private $process_stdout;
-    private $process_stderr;
-
-    /** @var RLPAWorkMode */
-    private $workmode;
-
-    public function __construct($socket)
-    {
-        $this->name = stream_socket_get_name($socket, true);
-
-        $this->shutdown = false;
-        $this->socket = $socket;
-        $this->packet = new RLPAPacket();
-
-        $this->process = null;
-        $this->process_stdin = null;
-        $this->process_stdout = null;
-        $this->process_stderr = null;
-
-        $this->workmode = null;
-
-        stream_set_blocking($socket, false);
-        $this->messageBox("Welcome, {$this->name}");
-    }
-
-    private function sendRLPAPacket($tag, $value = "")
-    {
-        if ($this->socket) {
-            fwrite($this->socket, (new RLPAPacket($tag, $value))->pack());
-        }
-    }
-
-    public function messageBox($msg)
-    {
-        $this->sendRLPAPacket(RLPAPacket::TAG_MESSAGEBOX, $msg);
-    }
-
-    public function lockAPDU()
-    {
-        $this->sendRLPAPacket(RLPAPacket::TAG_APDU_LOCK);
-    }
-
-    public function unlockAPDU()
-    {
-        $this->sendRLPAPacket(RLPAPacket::TAG_APDU_UNLOCK);
-    }
-
-    private function processPacket()
-    {
-        $work_class = null;
-
-        if ($this->packet->tag === RLPAPacket::TAG_APDU) {
-            if (!$this->process_stdin) {
-                return;
-            }
-            fwrite($this->process_stdin, json_encode(['type' => 'apdu', 'payload' => ['ecode' => 0, 'data' => bin2hex($this->packet->value)]]) . PHP_EOL);
-            return;
-        }
-
-        if ($this->workmode) {
-            return;
-        }
-
-        switch ($this->packet->tag) {
-            case RLPAPacket::TAG_MANAGEMNT:
-                $work_class = ShellMode::class;
-                break;
-            case RLPAPacket::TAG_PROCESS_NOTIFICATION:
-                $work_class = ProcessNotificationMode::class;
-                break;
-            case RLPAPacket::TAG_DOWNLOAD_PROFILE:
-                $work_class = DownloadProfileMode::class;
-                break;
-            default:
-                $this->messageBox("Unimplemented command.");
-                throw new Exception();
-                break;
-        }
-
-        if ($work_class === null) {
-            throw new Exception();
-        }
-
-        if ($work_class::requireStdin()) {
-            if (self::$stdin_lock) {
-                $this->messageBox("Already have one shell mode client");
-                throw new Exception();
-            }
-            stream_set_blocking(STDIN, false);
-        }
-
-        $this->workmode = new $work_class($this);
-        $this->workmode->start($this->packet->value);
-    }
-
-    public function onSocketRecv()
-    {
-        if ($this->workmode && $this->workmode->finished()) {
-            throw new Exception();
-        }
-
-        if ($this->shutdown) {
-            return;
-        }
-
-        $this->packet->recv($this->socket);
-
-        if (!$this->packet->isFinished()) {
-            return;
-        }
-
-        $this->processPacket();
-
-        $this->packet = new RLPAPacket();
-    }
-
-    public function onProcessStdout()
-    {
-        if ($this->workmode && $this->workmode->finished()) {
-            throw new Exception();
-        }
-
-        $stdout = fgets($this->process_stdout);
-        if (strlen($stdout) == 0) {
-            $this->processClose();
-            $this->workmode->onProcessFinished(null);
-            if ($this->workmode->finished()) {
-                throw new Exception();
-            }
-            return;
-        }
-
-        $request = json_decode($stdout, true);
-        if (!$request) {
-            return;
-        }
-
-        switch ($request['type']) {
-            case 'apdu':
-                switch ($request['payload']['func']) {
-                    case 'connect':
-                        fwrite($this->process_stdin, json_encode(['type' => 'apdu', 'payload' => ['ecode' => 0]]) . PHP_EOL);
-                        break;
-                    case 'logic_channel_open':
-                        fwrite($this->process_stdin, json_encode(['type' => 'apdu', 'payload' => ['ecode' => 0]]) . PHP_EOL);
-                        break;
-                    case 'transmit':
-                        fwrite($this->socket, (new RLPAPacket(RLPAPacket::TAG_APDU, hex2bin($request['payload']['param'])))->pack());
-                        break;
-                }
-                break;
-            case 'lpa':
-                $this->processClose();
-                $this->workmode->onProcessFinished($request['payload']);
-                if ($this->workmode->finished()) {
-                    throw new Exception();
-                }
-                break;
-            default:
-                // print_r($request);
-                break;
-        }
-    }
-
-    public function onProcessStderr()
-    {
-        if (!$this->process_stderr) {
-            return;
-        }
-
-        echo fgets($this->process_stderr);
-    }
-
-    public function onStdin()
-    {
-        if ($this->process !== null) {
-            while (fread(STDIN, 128));
-            return;
-        }
-        if ($this->workmode::requireStdin()) {
-            $this->workmode->onStdin(fgets(STDIN));
-            if ($this->workmode->finished()) {
-                throw new Exception();
-            }
-        }
-    }
-
-    public function getSelectable()
-    {
-        $selectable = [];
-
-        if ($this->shutdown) {
-            return null;
-        }
-
-        if ($this->socket) {
-            $selectable[] = [$this->socket, [$this, 'onSocketRecv']];
-        }
-
-        if ($this->process_stdout) {
-            $selectable[] = [$this->process_stdout, [$this, 'onProcessStdout']];
-        }
-
-        if ($this->process_stderr) {
-            $selectable[] = [$this->process_stderr, [$this, 'onProcessStderr']];
-        }
-
-        if ($this->workmode && $this->workmode::requireStdin()) {
-            $selectable[] = [STDIN, [$this, 'onStdin']];
-        }
-
-        return $selectable;
-    }
-
-    public function close()
-    {
-        if ($this->shutdown) {
-            return;
-        }
-
-        $this->shutdown = true;
-
-        $this->unlockAPDU();
-
-        if ($this->socket) {
-            $disconnect = (new RLPAPacket(RLPAPacket::TAG_CLOSE))->pack();
-            fwrite($this->socket, $disconnect);
-            stream_socket_shutdown($this->socket,  STREAM_SHUT_RDWR);
-            $this->socket = null;
-        }
-
-        $this->processClose();
-
-        if ($this->workmode && $this->workmode::requireStdin()) {
-            self::$stdin_lock = false;
-        }
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function processOpenLpac($cmd)
-    {
-        $this->lockAPDU();
-        $this->process = proc_open("./lpac {$cmd}", [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']], $pipes, ".", ['LPAC_APDU' => 'stdio']);
-        $this->process_stdin = $pipes[0];
-        $this->process_stdout = $pipes[1];
-        $this->process_stderr = $pipes[2];
-        stream_set_blocking($this->process_stdout, false);
-        stream_set_blocking($this->process_stderr, false);
-    }
-
-    private function processClose()
-    {
-        if ($this->process_stdin) {
-            fclose($this->process_stdin);
-            $this->process_stdin = null;
-        }
-        if ($this->process_stdout) {
-            fclose($this->process_stdout);
-            $this->process_stdout = null;
-        }
-        if ($this->process_stderr) {
-            fclose($this->process_stderr);
-            $this->process_stderr = null;
-        }
-        if ($this->process) {
-            proc_close($this->process);
-            $this->process = null;
-        }
-        $this->unlockAPDU();
-    }
-
-    public static function resource2id($resource)
-    {
-        $id = null;
-        if (is_resource($resource)) {
-            $id = 'R' . intval($resource);
-        } else {
-            $id = 'O' . spl_object_id($resource);
-        }
-
-        return $id;
-    }
-
-    public static function getSelectableTable($clients, &$read, &$callbackTable)
-    {
-        $read = [];
-        $callbackTable = [];
-        foreach ($clients as $c) {
-            $rss = $c->getSelectable();
-            foreach ($rss as $r) {
-                $read[self::resource2id($r[0])] = $r[0];
-                $callbackTable[self::resource2id($r[0])] = $r[1];
-            }
-        }
-    }
-}
-
-class RLPAPacket
-{
-    public $tag;
-    public $value;
-
-    private $_state;
-    private $_next_read_len;
-    private $_buffer;
-
-    public function __construct($tag = 0x00, $value = "")
-    {
-        $this->tag = $tag;
-        $this->value = $value;
-        $this->_state = 0;
-        $this->_next_read_len = 1;
-        $this->_buffer = "";
-    }
-
-    public function recv($socket)
-    {
-        if ($this->isFinished()) {
-            return;
-        }
-
-        $buf = stream_socket_recvfrom($socket, $this->_next_read_len);
-        if (strlen($buf) === 0) {
-            throw new \Exception();
-        }
-
-        $this->_next_read_len -= strlen($buf);
-        $this->_buffer .= $buf;
-
-        if ($this->_next_read_len === 0) {
-            switch ($this->_state) {
-                case 0:
-                    $this->tag = unpack('C', $this->_buffer)[1];
-                    $this->_state = 1;
-                    $this->_next_read_len = 2;
-                    $this->_buffer = "";
-                    break;
-                case 1:
-                    $this->_state = 2;
-                    $this->_next_read_len = unpack('v', $this->_buffer)[1];
-                    if ($this->_next_read_len >= (512 - 3)) {
-                        throw new \Exception();
-                    }
-                    $this->_buffer = "";
-                    if ($this->_next_read_len === 0) {
-                        $this->_state = 3;
-                        $this->value = "";
-                    }
-                    break;
-                case 2:
-                    $this->_state = 3;
-                    $this->value = $this->_buffer;
-                    $this->_buffer = "";
-                    break;
-            }
-        }
-    }
-
-    public function isFinished()
-    {
-        return ($this->_state === 3);
-    }
-
-    public function pack()
-    {
-        $packet = "";
-        $packet .= pack('C', $this->tag);
-        $packet .= pack('v', strlen($this->value));
-        $packet .= $this->value;
-
-        return $packet;
-    }
-
-    const TAG_MESSAGEBOX = 0x00;
-    const TAG_MANAGEMNT = 0x01;
-    const TAG_DOWNLOAD_PROFILE = 0x02;
-    const TAG_PROCESS_NOTIFICATION = 0x03;
-
-    const TAG_REBOOT = 0xFB;
-    const TAG_CLOSE = 0xFC;
-    const TAG_APDU_LOCK = 0xFD;
-    const TAG_APDU = 0xFE;
-    const TAG_APDU_UNLOCK = 0xFF;
-}
-
-abstract class RLPAWorkMode
-{
-    protected $client;
-
-    public function __construct(RLPAClient $client)
-    {
-        $this->client = $client;
-    }
-
-    public function start($data)
-    {
-    }
-
-    public function onStdin($data)
-    {
-    }
-
-    public function onProcessFinished($data)
-    {
-    }
-
-    public function finished()
-    {
-        return true;
-    }
-
-    static public function requireStdin()
-    {
-        return false;
-    }
-};
-
-gc_enable();
-$g_clients = [];
-$g_server_socket = stream_socket_server("tcp://0.0.0.0:1888");
-
-while (1) {
-    $read = [];
-    $callbackTable = [];
-    RLPAClient::getSelectableTable($g_clients, $read, $callbackTable);
-
-    $read['server'] = $g_server_socket;
-    $write = null;
-    $exception = null;
-
-    $ret = stream_select($read, $write, $exception, null);
-
-    foreach ($read as $key => $socket) {
-        if ($key === 'server') {
-            $accepted = stream_socket_accept($socket);
-            if (!$accepted) {
-                continue;
-            }
-            $client = new RLPAClient($accepted);
-            $g_clients[$client->getName()] = $client;
-            echo PHP_EOL . "Accepted {$client->getName()}" . PHP_EOL;
-            continue;
-        }
-        try {
-            ($callbackTable[$key])();
-        } catch (\Exception $e) {
-            $instance = $callbackTable[$key][0];
-            $instance->close();
-            $name = $instance->getName();
-            unset($instance);
-            unset($g_clients[$name]);
-            echo PHP_EOL . "Disconnected {$name}" . PHP_EOL;
-        }
-    }
-}