eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sig_opts non-optional in X509 structures

Browse source 
This simplifies the code.
This commit is contained in:
Manuel Pégourié-Gonnard 2014-06-05 17:07:30 +02:00
parent dddbb1d1eb
commit bf696d030b
8 changed files with 8 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/polarssl/config.h
View file

@ -223,16 +223,10 @@
/**
* \def POLARSSL_RSASSA_PSS_CERTIFICATES
*
* Enable parsing and verification of X.509 certificates and CRLs signed with
* RSASSA-PSS.
* Enable parsing and verification of X.509 certificates, CRLs and CSRS
* signed with RSASSA-PSS (aka PKCS#1 v2.1).
*
* This is disabled by default since it breaks binary compatibility with the
* 1.3.x line. If you choose to enable it, you will need to rebuild your
* application against the new header files, relinking will not be enough.
*
* TODO: actually disable it when done working on this branch ,)
*
* Uncomment this macro to allow using RSASSA-PSS in certificates.
* Comment this macro to disallow using RSASSA-PSS in certificates.
*/
#define POLARSSL_RSASSA_PSS_CERTIFICATES

2
include/polarssl/x509_crl.h
View file

@ -93,9 +93,7 @@ typedef struct _x509_crl
x509_buf sig;
md_type_t sig_md; /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
pk_type_t sig_pk; /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
void *sig_opts; /**< Signature options to be passed to pk_verify_ext(), eg for RSASSA-PSS */
#endif
struct _x509_crl *next;
}

2
include/polarssl/x509_crt.h
View file

@ -93,9 +93,7 @@ typedef struct _x509_crt
x509_buf sig; /**< Signature: hash of the tbs part signed with the private key. */
md_type_t sig_md; /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
pk_type_t sig_pk; /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
void *sig_opts; /**< Signature options to be passed to pk_verify_ext(), eg for RSASSA-PSS */
#endif
struct _x509_crt *next; /**< Next certificate in the CA-chain. */
}

2
include/polarssl/x509_csr.h
View file

@ -67,9 +67,7 @@ typedef struct _x509_csr
x509_buf sig;
md_type_t sig_md; /**< Internal representation of the MD algorithm of the signature algorithm, e.g. POLARSSL_MD_SHA256 */
pk_type_t sig_pk; /**< Internal representation of the Public Key algorithm of the signature algorithm, e.g. POLARSSL_PK_RSA */
#if defined(POLARSSL_RSASSA_PSS_CERTIFICATES)
void *sig_opts; /**< Signature options to be passed to pk_verify_ext(), eg for RSASSA-PSS */
#endif
}
x509_csr;