aggregate.c: tolerate AGGR_SIGN_SET-free contexts.

AGGR_SIGN_SET-free contexts are produced by blst_pairing_raw_aggregate.
supranational · Sep 14, 2021 · f47675f · f47675f
1 parent a9c4223
commit f47675f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/aggregate.c b/src/aggregate.c
@@ -419,6 +419,8 @@ BLST_ERROR blst_pairing_merge(PAIRING *ctx, const PAIRING *ctx1)
     if (ctx->nelems || ctx1->nelems)
         return BLST_AGGR_TYPE_MISMATCH;
 
+    ctx->ctrl |= ctx1->ctrl & MIN_SIG_OR_PK;
+
     switch (ctx->ctrl & MIN_SIG_OR_PK) {
         case AGGR_MIN_SIG:
             if (ctx->ctrl & ctx1->ctrl & AGGR_SIGN_SET) {
@@ -441,8 +443,7 @@ BLST_ERROR blst_pairing_merge(PAIRING *ctx, const PAIRING *ctx1)
             }
             break;
         case AGGR_UNDEFINED:
-            vec_copy(ctx, ctx1, sizeof(*ctx));
-            return BLST_SUCCESS;
+            break;
         default:
             return BLST_AGGR_TYPE_MISMATCH;
     }