|
Lines 191-197
pkinit_pkcs11_code_to_text(int err);
Link Here
|
| 191 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
191 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
| 192 |
#endif |
192 |
#endif |
| 193 |
|
193 |
|
| 194 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
194 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 195 |
|
195 |
|
| 196 |
/* 1.1 standardizes constructor and destructor names, renaming |
196 |
/* 1.1 standardizes constructor and destructor names, renaming |
| 197 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
197 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
|
Lines 3085-3091
typedef struct {
Link Here
|
| 3085 |
ASN1_SEQUENCE(DHvparams) = { |
3085 |
ASN1_SEQUENCE(DHvparams) = { |
| 3086 |
ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING), |
3086 |
ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING), |
| 3087 |
ASN1_SIMPLE(int_dhvparams, counter, BIGNUM) |
3087 |
ASN1_SIMPLE(int_dhvparams, counter, BIGNUM) |
|
|
3088 |
#if defined(LIBRESSL_VERSION_NUMBER) |
| 3089 |
} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams) |
| 3090 |
#else |
| 3088 |
} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams) |
3091 |
} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams) |
|
|
3092 |
#endif |
| 3089 |
|
3093 |
|
| 3090 |
ASN1_SEQUENCE(DHxparams) = { |
3094 |
ASN1_SEQUENCE(DHxparams) = { |
| 3091 |
ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM), |
3095 |
ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM), |
|
Lines 3093-3099
ASN1_SEQUENCE(DHxparams) = {
Link Here
|
| 3093 |
ASN1_OPT(int_dhx942_dh, q, BIGNUM), |
3097 |
ASN1_OPT(int_dhx942_dh, q, BIGNUM), |
| 3094 |
ASN1_OPT(int_dhx942_dh, j, BIGNUM), |
3098 |
ASN1_OPT(int_dhx942_dh, j, BIGNUM), |
| 3095 |
ASN1_OPT(int_dhx942_dh, vparams, DHvparams), |
3099 |
ASN1_OPT(int_dhx942_dh, vparams, DHvparams), |
|
|
3100 |
#if defined(LIBRESSL_VERSION_NUMBER) |
| 3101 |
} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams) |
| 3102 |
#else |
| 3096 |
} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams) |
3103 |
} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams) |
|
|
3104 |
#endif |
| 3097 |
|
3105 |
|
| 3098 |
static DH * |
3106 |
static DH * |
| 3099 |
decode_dh_params(const uint8_t *p, unsigned int len) |
3107 |
decode_dh_params(const uint8_t *p, unsigned int len) |
