Merge branch 'develop'

LibtraceTeam · May 14, 2024 · 02e7157 · 02e7157
2 parents c6ce1a5 + 9a35941
commit 02e7157
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/deb-build.yaml b/.github/workflows/deb-build.yaml
@@ -112,7 +112,7 @@ jobs:
            mkdir -p packages/${DIRNAME}
            find . -name "*.deb" | xargs cp -t packages/${DIRNAME}/
        - name: Publish package to cloudsmith
-         uses: wanduow/action-cloudsmith-upload-packages@v1
+         uses: salcock/action-cloudsmith-upload-packages@v1.8
          with:
            path: packages/
            repo: ${{ secrets.CLOUDSMITH_OWNER }}/libwandder

diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,9 @@
+Version 2.0.12
+===============
+  * ETSILI: fix incorrect decoding of userLocationInformation
+
 Version 2.0.11
+===============
   * Add support for decoding sequences of UTF8Strings
   * ETSILI: fix broken decoding hierarchy for Email Address Lists
 

diff --git a/README b/README
@@ -1,6 +1,6 @@
 libwandder -- C library for DER encoding and decoding.
 
-Current Stable Version: 2.0.11
+Current Stable Version: 2.0.12
 
 ---------------------------------------------------------------------------
 Copyright (c) 2017-2024 The University of Waikato, Hamilton, New Zealand.

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Super primitive configure script
 
-AC_INIT(libwandder, 2.0.11, shane@alcock.co.nz)
+AC_INIT(libwandder, 2.0.12, shane@alcock.co.nz)
 
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR(src/decoder.c)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libwandder2 (2.0.12-1) unstable; urgency=medium
+
+  * ETSILI: fix incorrect decoding of userLocationInformation elements
+
+ -- Shane Alcock <shane@alcock.co.nz>  Wed, 15 May 2024 10:18:24 +1200
+
 libwandder2 (2.0.11-1) unstable; urgency=medium
 
   * Add support for decoding sequences of UTF8Strings

diff --git a/rpm/libwandder2.spec b/rpm/libwandder2.spec
@@ -1,5 +1,5 @@
 Name:           libwandder2
-Version:        2.0.11
+Version:        2.0.12
 Release:        1%{?dist}
 Summary:        C Library for encoding and decoding data using DER
 
@@ -59,6 +59,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/*.so
 
 %changelog
+* Wed May 15 2024 Shane Alcock <shane@alcock.co.nz> - 2.0.12-1
+- Updated to 2.0.12 release of libwandder
+
 * Wed Mar 20 2024 Shane Alcock <shane@alcock.co.nz> - 2.0.11-1
 - Updated to 2.0.11 release of libwandder
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -5,6 +5,6 @@ libwandder_la_SOURCES=encoder.c decoder.c libwandder.h libwandder_etsili.c \
         libwandder_etsili.h itemhandler.c itemhandler.h wandder_internal.h
 
 libwandder_la_LIBADD = @ADD_LIBS@
-libwandder_la_LDFLAGS = @ADD_LDFLAGS@ -version-info 4:4:2
+libwandder_la_LDFLAGS = @ADD_LDFLAGS@ -version-info 4:5:2
 libwandder_la_CPPFLAGS = -Werror -Wall
 
diff --git a/src/libwandder_etsili.c b/src/libwandder_etsili.c
@@ -1638,14 +1638,14 @@ static char *stringify_uli(wandder_etsispec_t *etsidec,
     int write_rem = len - 1;
     int res;
 
-    memset(valstr, 0, len);
-    if (len < 4) {
+    if (len == 0 || valstr == NULL) {
         return NULL;
     }
-    flags = item->valptr[3];
+    memset(valstr, 0, len);
+    flags = item->valptr[0];
 
-    ptr = ptr + 4;
-    used = 4;
+    ptr = ptr + 1;
+    used = 1;
 
     while (f < 256) {
         res = -1;