From 22979d3c9676c017dbab00e5d893fa1b550fe940 Mon Sep 17 00:00:00 2001 From: Mathias Laurin Date: Fri, 6 Mar 2020 21:36:21 +0100 Subject: [PATCH] *: Clean up .pxd files using cimport --- src/mbedtls/pk.pxd | 61 ++++++++++++++++++++------------------------ src/mbedtls/x509.pxd | 41 ++++++++++++----------------- 2 files changed, 44 insertions(+), 58 deletions(-) diff --git a/src/mbedtls/pk.pxd b/src/mbedtls/pk.pxd index 2459ce4b..39d72420 100644 --- a/src/mbedtls/pk.pxd +++ b/src/mbedtls/pk.pxd @@ -8,23 +8,18 @@ __copyright__ = "Copyright 2016, Mathias Laurin, Elaborated Networks GmbH" __license__ = "MIT License" -cdef extern from "mbedtls/md.h" nogil: - ctypedef enum mbedtls_md_type_t: pass - - -cdef extern from "mbedtls/bignum.h" nogil: - ctypedef struct mbedtls_mpi: - pass +cimport mbedtls._md as _md +cimport mbedtls.mpi as _mpi cdef extern from "mbedtls/dhm.h" nogil: ctypedef struct mbedtls_dhm_context: - mbedtls_mpi P - mbedtls_mpi G - mbedtls_mpi X - mbedtls_mpi GX - mbedtls_mpi GY - mbedtls_mpi K + _mpi.mbedtls_mpi P + _mpi.mbedtls_mpi G + _mpi.mbedtls_mpi X + _mpi.mbedtls_mpi GX + _mpi.mbedtls_mpi GY + _mpi.mbedtls_mpi K void mbedtls_dhm_init(mbedtls_dhm_context *ctx) void mbedtls_dhm_free(mbedtls_dhm_context *ctx) @@ -84,21 +79,21 @@ cdef extern from "mbedtls/ecp.h" nogil: const char *name ctypedef struct mbedtls_ecp_point: - mbedtls_mpi X - mbedtls_mpi Y - mbedtls_mpi Z + _mpi.mbedtls_mpi X + _mpi.mbedtls_mpi Y + _mpi.mbedtls_mpi Z ctypedef struct mbedtls_ecp_group: mbedtls_ecp_group_id id; - mbedtls_mpi P - mbedtls_mpi A - mbedtls_mpi B + _mpi.mbedtls_mpi P + _mpi.mbedtls_mpi A + _mpi.mbedtls_mpi B mbedtls_ecp_point G - mbedtls_mpi N + _mpi.mbedtls_mpi N size_t pbits size_t nbits unsigned int h - int (*modp)(mbedtls_mpi *) + int (*modp)(_mpi.mbedtls_mpi *) int (*t_pre)(mbedtls_ecp_point *, void *) int (*t_post)(mbedtls_ecp_point *, void *) void *t_data @@ -107,7 +102,7 @@ cdef extern from "mbedtls/ecp.h" nogil: ctypedef struct mbedtls_ecp_keypair: mbedtls_ecp_group grp - mbedtls_mpi d + _mpi.mbedtls_mpi d mbedtls_ecp_point Q int MBEDTLS_ECP_MAX_BYTES @@ -164,7 +159,7 @@ cdef extern from "mbedtls/ecp.h" nogil: int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R, - const mbedtls_mpi *m, + const _mpi.mbedtls_mpi *m, const mbedtls_ecp_point *P, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) @@ -179,7 +174,7 @@ cdef extern from "mbedtls/ecp.h" nogil: # mbedtls_ecp_gen_keypair_base int mbedtls_ecp_gen_keypair( mbedtls_ecp_group *grp, - mbedtls_mpi *d, + _mpi.mbedtls_mpi *d, mbedtls_ecp_point *Q, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) @@ -198,24 +193,24 @@ cdef extern from "mbedtls/ecdh.h" nogil: ctypedef struct mbedtls_ecdh_context: mbedtls_ecp_group grp - mbedtls_mpi d # private key + _mpi.mbedtls_mpi d # private key mbedtls_ecp_point Q # public key mbedtls_ecp_point Qp # peer's public key - mbedtls_mpi z # shared secret + _mpi.mbedtls_mpi z # shared secret # mbedtls_ecp_group # ----------------- int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, - mbedtls_mpi *d, + _mpi.mbedtls_mpi *d, mbedtls_ecp_point *Q, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, - mbedtls_mpi *z, + _mpi.mbedtls_mpi *z, const mbedtls_ecp_point *Q, - const mbedtls_mpi *d, + const _mpi.mbedtls_mpi *d, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) @@ -254,7 +249,7 @@ cdef extern from "mbedtls/ecdh.h" nogil: cdef extern from "mbedtls/ecdsa.h" nogil: ctypedef struct mbedtls_ecdsa_context: mbedtls_ecp_group grp - mbedtls_mpi d + _mpi.mbedtls_mpi d mbedtls_ecp_point Q int MBEDTLS_ECDSA_MAX_LEN @@ -352,17 +347,17 @@ cdef extern from "mbedtls/pk.h" nogil: mbedtls_pk_type_t type) int mbedtls_pk_verify( - mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg, + mbedtls_pk_context *ctx, _md.mbedtls_md_type_t md_alg, const unsigned char *hash, size_t hash_len, const unsigned char *sig, size_t sig_len) # int mbedtls_pk_verify_ext( # mbedtls_pk_type_t type, const void *options, - # mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg, + # mbedtls_pk_context *ctx, _md.mbedtls_md_type_t md_alg, # const unsigned char *hash, size_t hash_len, # const unsigned char *sig, size_t sig_len) int mbedtls_pk_sign( - mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg, + mbedtls_pk_context *ctx, _md.mbedtls_md_type_t md_alg, const unsigned char *hash, size_t hash_len, unsigned char *sig, size_t *sig_len, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) diff --git a/src/mbedtls/x509.pxd b/src/mbedtls/x509.pxd index 5dd257e7..e816fd1b 100644 --- a/src/mbedtls/x509.pxd +++ b/src/mbedtls/x509.pxd @@ -11,6 +11,11 @@ __copyright__ = "Copyright 2018, Mathias Laurin" __license__ = "MIT License" +cimport mbedtls._md as _md +cimport mbedtls.mpi as _mpi +cimport mbedtls.pk as _pk + + cdef extern from "mbedtls/asn1.h" nogil: cdef struct mbedtls_asn1_buf: int tag @@ -26,20 +31,6 @@ cdef extern from "mbedtls/asn1.h" nogil: unsigned char next_merged -cdef extern from "mbedtls/bignum.h" nogil: - ctypedef struct mbedtls_mpi: - pass - - -cdef extern from "mbedtls/md.h" nogil: - ctypedef enum mbedtls_md_type_t: pass - - -cdef extern from "mbedtls/pk.h" nogil: - ctypedef struct mbedtls_pk_context: - pass - - cdef extern from "mbedtls/x509.h" nogil: ctypedef mbedtls_asn1_buf mbedtls_x509_buf ctypedef mbedtls_asn1_named_data mbedtls_x509_name @@ -64,7 +55,7 @@ cdef extern from "mbedtls/x509_crt.h" nogil: mbedtls_x509_name subject mbedtls_x509_time valid_from mbedtls_x509_time valid_to - mbedtls_pk_context pk # public key + _pk.mbedtls_pk_context pk # public key # mbedtls_x509_buf issuer_id # mbedtls_x509_buf subject_id # mbedtls_x509_buf v3_ext @@ -77,7 +68,7 @@ cdef extern from "mbedtls/x509_crt.h" nogil: # unsigned char ns_cert_type mbedtls_x509_buf sig - mbedtls_md_type_t sig_md + _md.mbedtls_md_type_t sig_md # mbedtls_pk_type_t sig_pk # void *sig_opts mbedtls_x509_crt *next @@ -132,7 +123,7 @@ cdef extern from "mbedtls/x509_crt.h" nogil: int version) int mbedtls_x509write_crt_set_serial( mbedtls_x509write_cert *ctx, - mbedtls_mpi *serial) + _mpi.mbedtls_mpi *serial) int mbedtls_x509write_crt_set_validity( mbedtls_x509write_cert *ctx, @@ -146,13 +137,13 @@ cdef extern from "mbedtls/x509_crt.h" nogil: const char *subject_name) void mbedtls_x509write_crt_set_subject_key( mbedtls_x509write_cert *ctx, - mbedtls_pk_context *key) + _pk.mbedtls_pk_context *key) void mbedtls_x509write_crt_set_issuer_key( mbedtls_x509write_cert *ctx, - mbedtls_pk_context *key) + _pk.mbedtls_pk_context *key) void mbedtls_x509write_crt_set_md_alg( mbedtls_x509write_cert *ctx, - mbedtls_md_type_t md_alg) + _md.mbedtls_md_type_t md_alg) # mbedtls_x509write_crt_set_extension int mbedtls_x509write_crt_set_basic_constraints( @@ -190,10 +181,10 @@ cdef extern from "mbedtls/x509_csr.h" nogil: int version # mbedtls_x509_buf subject_raw mbedtls_x509_name subject - mbedtls_pk_context pk + _pk.mbedtls_pk_context pk mbedtls_x509_buf sig_oid mbedtls_x509_buf sig - mbedtls_md_type_t sig_md + _md.mbedtls_md_type_t sig_md # mbedtls_pk_type_t sig_pk # void *sig_opts @@ -230,10 +221,10 @@ cdef extern from "mbedtls/x509_csr.h" nogil: const char *subject_name) void mbedtls_x509write_csr_set_key( mbedtls_x509write_csr *ctx, - mbedtls_pk_context *key) + _pk.mbedtls_pk_context *key) void mbedtls_x509write_csr_set_md_alg( mbedtls_x509write_csr *ctx, - mbedtls_md_type_t md_alg) + _md.mbedtls_md_type_t md_alg) # mbedtls_x509write_csr_set_key_usage # mbedtls_x509write_csr_set_ns_cert_type @@ -276,7 +267,7 @@ cdef extern from "mbedtls/x509_crl.h" nogil: mbedtls_x509_buf crl_ext mbedtls_x509_buf sig_oid2 mbedtls_x509_buf sig - mbedtls_md_type_t sig_md + _md.mbedtls_md_type_t sig_md # mbedtls_pk_type_t sig_pk # void *sig_opts mbedtls_x509_crl *next