Skip to content

Commit 77731c6

Browse files
committed
pk: pass pk_context pointer to wrappers intead of void one
Signed-off-by: valerio <valerio.setti@nordicsemi.no>
1 parent 3c3b94a commit 77731c6

File tree

3 files changed

+98
-92
lines changed

3 files changed

+98
-92
lines changed

library/pk.c

+11-9
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ int mbedtls_pk_verify_restartable(mbedtls_pk_context *ctx,
443443
return ret;
444444
}
445445

446-
ret = ctx->pk_info->verify_rs_func(ctx->pk_ctx,
446+
ret = ctx->pk_info->verify_rs_func(ctx,
447447
md_alg, hash, hash_len, sig, sig_len, rs_ctx->rs_ctx);
448448

449449
if (ret != MBEDTLS_ERR_ECP_IN_PROGRESS) {
@@ -460,7 +460,7 @@ int mbedtls_pk_verify_restartable(mbedtls_pk_context *ctx,
460460
return MBEDTLS_ERR_PK_TYPE_MISMATCH;
461461
}
462462

463-
return ctx->pk_info->verify_func(ctx->pk_ctx, md_alg, hash, hash_len,
463+
return ctx->pk_info->verify_func(ctx, md_alg, hash, hash_len,
464464
sig, sig_len);
465465
}
466466

@@ -626,7 +626,7 @@ int mbedtls_pk_sign_restartable(mbedtls_pk_context *ctx,
626626
return ret;
627627
}
628628

629-
ret = ctx->pk_info->sign_rs_func(ctx->pk_ctx, md_alg,
629+
ret = ctx->pk_info->sign_rs_func(ctx, md_alg,
630630
hash, hash_len,
631631
sig, sig_size, sig_len,
632632
f_rng, p_rng, rs_ctx->rs_ctx);
@@ -645,7 +645,7 @@ int mbedtls_pk_sign_restartable(mbedtls_pk_context *ctx,
645645
return MBEDTLS_ERR_PK_TYPE_MISMATCH;
646646
}
647647

648-
return ctx->pk_info->sign_func(ctx->pk_ctx, md_alg,
648+
return ctx->pk_info->sign_func(ctx, md_alg,
649649
hash, hash_len,
650650
sig, sig_size, sig_len,
651651
f_rng, p_rng);
@@ -736,7 +736,7 @@ int mbedtls_pk_decrypt(mbedtls_pk_context *ctx,
736736
return MBEDTLS_ERR_PK_TYPE_MISMATCH;
737737
}
738738

739-
return ctx->pk_info->decrypt_func(ctx->pk_ctx, input, ilen,
739+
return ctx->pk_info->decrypt_func(ctx, input, ilen,
740740
output, olen, osize, f_rng, p_rng);
741741
}
742742

@@ -756,7 +756,7 @@ int mbedtls_pk_encrypt(mbedtls_pk_context *ctx,
756756
return MBEDTLS_ERR_PK_TYPE_MISMATCH;
757757
}
758758

759-
return ctx->pk_info->encrypt_func(ctx->pk_ctx, input, ilen,
759+
return ctx->pk_info->encrypt_func(ctx, input, ilen,
760760
output, olen, osize, f_rng, p_rng);
761761
}
762762

@@ -791,7 +791,9 @@ int mbedtls_pk_check_pair(const mbedtls_pk_context *pub,
791791
}
792792
}
793793

794-
return prv->pk_info->check_pair_func(pub->pk_ctx, prv->pk_ctx, f_rng, p_rng);
794+
return prv->pk_info->check_pair_func((mbedtls_pk_context *) pub,
795+
(mbedtls_pk_context *) prv,
796+
f_rng, p_rng);
795797
}
796798

797799
/*
@@ -805,7 +807,7 @@ size_t mbedtls_pk_get_bitlen(const mbedtls_pk_context *ctx)
805807
return 0;
806808
}
807809

808-
return ctx->pk_info->get_bitlen(ctx->pk_ctx);
810+
return ctx->pk_info->get_bitlen((mbedtls_pk_context *) ctx);
809811
}
810812

811813
/*
@@ -821,7 +823,7 @@ int mbedtls_pk_debug(const mbedtls_pk_context *ctx, mbedtls_pk_debug_item *items
821823
return MBEDTLS_ERR_PK_TYPE_MISMATCH;
822824
}
823825

824-
ctx->pk_info->debug_func(ctx->pk_ctx, items);
826+
ctx->pk_info->debug_func((mbedtls_pk_context *) ctx, items);
825827
return 0;
826828
}
827829

0 commit comments

Comments
 (0)