fix bug derutil.c and es10b.c on windows platform

estkme-group · Mar 13, 2024 · d2bb1f5 · d2bb1f5
1 parent 707bd3a
commit d2bb1f5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/euicc/derutil.c b/euicc/derutil.c
@@ -301,13 +301,17 @@ long euicc_derutil_convert_bin2long(const uint8_t *buffer, uint32_t buffer_len)
 
 int euicc_derutil_convert_long2bin(uint8_t *buffer, uint32_t *buffer_len, long value)
 {
-    uint8_t required_len;
+    uint8_t required_len = 1;
 
-    for (int i = 0; i < 8; i++)
+    for (int i = 1; i < sizeof(value); i++)
     {
-        if (value >> (i * 8))
+        if ((value >> (i * 8)))
         {
-            required_len = i + 1;
+            required_len++;
+        }
+        else
+        {
+            break;
         }
     }
 

diff --git a/euicc/es10b.c b/euicc/es10b.c
@@ -1019,7 +1019,7 @@ int es10b_retrieve_notifications_list(struct euicc_ctx *ctx, struct es10b_pendin
     int fret = 0;
     uint8_t seqNumber_buf[sizeof(seqNumber)];
     uint32_t seqNumber_buf_len = sizeof(seqNumber_buf);
-    struct euicc_derutil_node n_request;
+    struct euicc_derutil_node n_request, n_searchCriteria, n_seqNumber;
     uint32_t reqlen;
     uint8_t *respbuf = NULL;
     unsigned resplen;
@@ -1033,21 +1033,19 @@ int es10b_retrieve_notifications_list(struct euicc_ctx *ctx, struct es10b_pendin
         goto err;
     }
 
-    n_request = (struct euicc_derutil_node){
-        .tag = 0xBF2B, // RetrieveNotificationsListRequest
-        .pack = {
-            .child = &(struct euicc_derutil_node){
-                .tag = 0xA0, // searchCriteria
-                .pack = {
-                    .child = &(struct euicc_derutil_node){
-                        .tag = 0x80, // seqNumber
-                        .length = seqNumber_buf_len,
-                        .value = seqNumber_buf,
-                    },
-                },
-            },
-        },
-    };
+    memset(&n_request, 0, sizeof(n_request));
+    memset(&n_searchCriteria, 0, sizeof(n_searchCriteria));
+    memset(&n_seqNumber, 0, sizeof(n_seqNumber));
+
+    n_request.tag = 0xBF2B; // RetrieveNotificationsListRequest
+    n_request.pack.child = &n_searchCriteria;
+
+    n_searchCriteria.tag = 0xA0; // searchCriteria
+    n_searchCriteria.pack.child = &n_seqNumber;
+
+    n_seqNumber.tag = 0x80; // seqNumber
+    n_seqNumber.length = seqNumber_buf_len;
+    n_seqNumber.value = seqNumber_buf;
 
     reqlen = sizeof(ctx->apdu._internal.request_buffer.body);
     if (euicc_derutil_pack(ctx->apdu._internal.request_buffer.body, &reqlen, &n_request))
@@ -1136,7 +1134,7 @@ int es10b_remove_notification_from_list(struct euicc_ctx *ctx, unsigned long seq
     int fret = 0;
     uint8_t seqNumber_buf[sizeof(seqNumber)];
     uint32_t seqNumber_buf_len = sizeof(seqNumber_buf);
-    struct euicc_derutil_node n_request;
+    struct euicc_derutil_node n_request, n_seqNumber;
     uint32_t reqlen;
     uint8_t *respbuf = NULL;
     unsigned resplen;
@@ -1148,16 +1146,15 @@ int es10b_remove_notification_from_list(struct euicc_ctx *ctx, unsigned long seq
         goto err;
     }
 
-    n_request = (struct euicc_derutil_node){
-        .tag = 0xBF30, // NotificationSentRequest
-        .pack = {
-            .child = &(struct euicc_derutil_node){
-                .tag = 0x80, // seqNumber
-                .length = seqNumber_buf_len,
-                .value = seqNumber_buf,
-            },
-        },
-    };
+    memset(&n_request, 0, sizeof(n_request));
+    memset(&n_seqNumber, 0, sizeof(n_seqNumber));
+
+    n_request.tag = 0xBF30; // NotificationSentRequest
+    n_request.pack.child = &n_seqNumber;
+
+    n_seqNumber.tag = 0x80; // seqNumber
+    n_seqNumber.length = seqNumber_buf_len;
+    n_seqNumber.value = seqNumber_buf;
 
     reqlen = sizeof(ctx->apdu._internal.request_buffer.body);
     if (euicc_derutil_pack(ctx->apdu._internal.request_buffer.body, &reqlen, &n_request))