diff options
| author | Vitaly Chikunov <vt@altlinux.org> | 2018-07-25 09:13:22 +0300 |
|---|---|---|
| committer | Vitaly Chikunov <vt@altlinux.org> | 2018-07-25 11:00:00 +0300 |
| commit | eb01b80247de3fa3848d58d7f2816aff8f396630 (patch) | |
| tree | 1bfe42ad223e9717c10767875d60e21c66a9845b /gost_ameth.c | |
| parent | 767ac3fdf61c3aaec9069a9a42bbb39b3b772574 (diff) | |
| download | gost-engine-eb01b80247de3fa3848d58d7f2816aff8f396630.zip gost-engine-eb01b80247de3fa3848d58d7f2816aff8f396630.tar.gz gost-engine-eb01b80247de3fa3848d58d7f2816aff8f396630.tar.bz2 | |
Move openssl-1.0.2 shim layer here
Previously, we had shim layer in our openssl branch
Could be squashed with 01d26132d156ba9fff7a8142d5a6899d7b2e6286
Diffstat (limited to 'gost_ameth.c')
| -rw-r--r-- | gost_ameth.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gost_ameth.c b/gost_ameth.c index 5b93ea6..5e20f1e 100644 --- a/gost_ameth.c +++ b/gost_ameth.c @@ -21,6 +21,13 @@ #define PK_WRAP_PARAM "LEGACY_PK_WRAP" +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +/* some functions have const'ed arguments since openssl-1.1.0 */ +# define OPENSSL110_const const +#else +# define OPENSSL110_const +#endif + /* * Pack bignum into byte buffer of given size, filling all leading bytes by * zeros @@ -131,9 +138,9 @@ static int gost_decode_nid_params(EVP_PKEY *pkey, int pkey_nid, int param_nid) * Parses GOST algorithm parameters from X509_ALGOR and modifies pkey setting * NID and parameters */ -static int decode_gost_algor_params(EVP_PKEY *pkey, X509_ALGOR *palg) +static int decode_gost_algor_params(EVP_PKEY *pkey, OPENSSL110_const X509_ALGOR *palg) { - ASN1_OBJECT *palg_obj = NULL; + OPENSSL110_const ASN1_OBJECT *palg_obj = NULL; int ptype = V_ASN1_UNDEF; int pkey_nid = NID_undef, param_nid = NID_undef; ASN1_STRING *pval = NULL; @@ -142,7 +149,7 @@ static int decode_gost_algor_params(EVP_PKEY *pkey, X509_ALGOR *palg) if (!pkey || !palg) return 0; - X509_ALGOR_get0(&palg_obj, &ptype, (void **)&pval, palg); + X509_ALGOR_get0(&palg_obj, &ptype, (OPENSSL110_const void **)&pval, palg); if (ptype != V_ASN1_SEQUENCE) { GOSTerr(GOST_F_DECODE_GOST_ALGOR_PARAMS, GOST_R_BAD_KEY_PARAMETERS_FORMAT); @@ -331,14 +338,14 @@ static BIGNUM *unmask_priv_key(EVP_PKEY *pk, return pknum_masked; } -static int priv_decode_gost(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf) +static int priv_decode_gost(EVP_PKEY *pk, OPENSSL110_const PKCS8_PRIV_KEY_INFO *p8inf) { const unsigned char *pkey_buf = NULL, *p = NULL; int priv_len = 0; BIGNUM *pk_num = NULL; int ret = 0; - X509_ALGOR *palg = NULL; - ASN1_OBJECT *palg_obj = NULL; + OPENSSL110_const X509_ALGOR *palg = NULL; + OPENSSL110_const ASN1_OBJECT *palg_obj = NULL; ASN1_INTEGER *priv_key = NULL; int expected_key_len = 32; |