Merge pull request #9818 from julek-wolfssl/sssd-2.10.2

sssd 2.10.2 changes

.github/workflows/sssd.yml

@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         # List of releases to test
-        ref: [ 2.9.1 ]
+        ref: [ 2.9.1, 2.10.2 ]
     name: ${{ matrix.ref }}
     if: github.repository_owner == 'wolfssl'
     runs-on: ubuntu-24.04
@@ -61,7 +61,8 @@ jobs:
           # Don't prompt for anything
           export DEBIAN_FRONTEND=noninteractive
           sudo apt-get update
-          sudo apt-get install -y build-essential autoconf libldb-dev libldb2 python3-ldb bc
+          sudo apt-get install -y build-essential autoconf libldb-dev \
+            libldb2 python3-ldb bc libcap-dev
 
       - name: Setup env
         run: |

src/pk_ec.c

@@ -2824,6 +2824,37 @@ int wolfSSL_EC_POINT_copy(WOLFSSL_EC_POINT *dest, const WOLFSSL_EC_POINT *src)
     return ret;
 }
 
+/* Duplicates an EC point.
+ *
+ * @param [in] src    EC point to duplicate.
+ * @param [in] group  EC group for the new point.
+ * @return  New EC point on success.
+ * @return  NULL on failure.
+ */
+WOLFSSL_EC_POINT *wolfSSL_EC_POINT_dup(const WOLFSSL_EC_POINT *src,
+    const WOLFSSL_EC_GROUP *group)
+{
+    WOLFSSL_EC_POINT *dest;
+
+    WOLFSSL_ENTER("wolfSSL_EC_POINT_dup");
+
+    if ((src == NULL) || (group == NULL)) {
+        return NULL;
+    }
+
+    dest = wolfSSL_EC_POINT_new(group);
+    if (dest == NULL) {
+        return NULL;
+    }
+
+    if (wolfSSL_EC_POINT_copy(dest, src) != 1) {
+        wolfSSL_EC_POINT_free(dest);
+        return NULL;
+    }
+
+    return dest;
+}
+
 /* Checks whether point is at infinity.
  *
  * Return code compliant with OpenSSL.

tests/api/test_ossl_ec.c

@@ -314,6 +314,7 @@ int test_wolfSSL_EC_POINT(void)
     EC_POINT* set_point = NULL;
     EC_POINT* get_point = NULL;
     EC_POINT* infinity = NULL;
+    EC_POINT* dup_point = NULL;
     BIGNUM* k = NULL;
     BIGNUM* Gx = NULL;
     BIGNUM* Gy = NULL;
@@ -507,6 +508,12 @@ int test_wolfSSL_EC_POINT(void)
     ExpectIntEQ(EC_POINT_copy(new_point, NULL), 0);
     ExpectIntEQ(EC_POINT_copy(new_point, set_point), 1);
 
+    /* Test duplicating */
+    ExpectNull(EC_POINT_dup(NULL, group));
+    ExpectNull(EC_POINT_dup(set_point, NULL));
+    ExpectNotNull(dup_point = EC_POINT_dup(set_point, group));
+    ExpectIntEQ(EC_POINT_cmp(group, dup_point, set_point, ctx), 0);
+
     /* Test inverting */
     ExpectIntEQ(EC_POINT_invert(NULL, NULL, ctx), 0);
     ExpectIntEQ(EC_POINT_invert(NULL, new_point, ctx), 0);
@@ -526,6 +533,12 @@ int test_wolfSSL_EC_POINT(void)
         ExpectIntEQ(EC_POINT_add(group, orig_point, orig_point, new_point,
                                  NULL), 1);
         ExpectIntEQ(EC_POINT_cmp(group, orig_point, set_point, NULL), 0);
+        /* dup_point equals set_point so let's test with that too */
+        ExpectIntEQ(EC_POINT_add(group, orig_point, dup_point, dup_point, NULL),
+                    1);
+        ExpectIntEQ(EC_POINT_add(group, orig_point, orig_point, new_point,
+                                 NULL), 1);
+        ExpectIntEQ(EC_POINT_cmp(group, orig_point, set_point, NULL), 0);
         EC_POINT_free(orig_point);
     }
 #endif
@@ -769,6 +782,7 @@ int test_wolfSSL_EC_POINT(void)
     BN_free(k);
     BN_free(set_point_bn);
     EC_POINT_free(infinity);
+    EC_POINT_free(dup_point);
     EC_POINT_free(new_point);
     EC_POINT_free(set_point);
     EC_POINT_clear_free(Gxy);

wolfssl/openssl/ec.h

@@ -379,6 +379,9 @@ int wolfSSL_EC_POINT_cmp(const WOLFSSL_EC_GROUP *group,
 WOLFSSL_API int wolfSSL_EC_POINT_copy(WOLFSSL_EC_POINT *dest,
                                       const WOLFSSL_EC_POINT *src);
 WOLFSSL_API
+WOLFSSL_EC_POINT *wolfSSL_EC_POINT_dup(const WOLFSSL_EC_POINT *src,
+                                       const WOLFSSL_EC_GROUP *group);
+WOLFSSL_API
 void wolfSSL_EC_POINT_free(WOLFSSL_EC_POINT *point);
 WOLFSSL_API
 int wolfSSL_EC_POINT_is_at_infinity(const WOLFSSL_EC_GROUP *group,
@@ -479,6 +482,7 @@ typedef WOLFSSL_EC_KEY_METHOD         EC_KEY_METHOD;
 #define EC_POINT_clear_free             wolfSSL_EC_POINT_clear_free
 #define EC_POINT_cmp                    wolfSSL_EC_POINT_cmp
 #define EC_POINT_copy                   wolfSSL_EC_POINT_copy
+#define EC_POINT_dup                    wolfSSL_EC_POINT_dup
 #define EC_POINT_is_at_infinity         wolfSSL_EC_POINT_is_at_infinity
 
 #define EC_get_builtin_curves           wolfSSL_EC_get_builtin_curves