diff options
| author | tb <> | 2018-05-01 19:01:28 +0000 |
|---|---|---|
| committer | tb <> | 2018-05-01 19:01:28 +0000 |
| commit | a25a0cc2cb4d355062b3c8b6944d4e2da213facd (patch) | |
| tree | e9d6db4dc429199f91cfda5cd0905819d2440282 /src/lib/libcrypto/gost | |
| parent | 9b39dce8f6a1410a06e212d7ed7364d9dc7e3f13 (diff) | |
| download | openbsd-a25a0cc2cb4d355062b3c8b6944d4e2da213facd.tar.gz openbsd-a25a0cc2cb4d355062b3c8b6944d4e2da213facd.tar.bz2 openbsd-a25a0cc2cb4d355062b3c8b6944d4e2da213facd.zip | |
Convert a handful of X509_*() functions to take const as in OpenSSL.
tested in a bulk by sthen
ok jsing
Diffstat (limited to 'src/lib/libcrypto/gost')
| -rw-r--r-- | src/lib/libcrypto/gost/gostr341001_ameth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c index b6958c77d5..ed0b949d9d 100644 --- a/src/lib/libcrypto/gost/gostr341001_ameth.c +++ b/src/lib/libcrypto/gost/gostr341001_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gostr341001_ameth.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: gostr341001_ameth.c,v 1.12 2018/05/01 19:01:28 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 3 | * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 4 | * Copyright (c) 2005-2006 Cryptocom LTD | 4 | * Copyright (c) 2005-2006 Cryptocom LTD |
| @@ -201,7 +201,7 @@ pub_decode_gost01(EVP_PKEY *pk, X509_PUBKEY *pub) | |||
| 201 | == 0) | 201 | == 0) |
| 202 | return 0; | 202 | return 0; |
| 203 | (void)EVP_PKEY_assign_GOST(pk, NULL); | 203 | (void)EVP_PKEY_assign_GOST(pk, NULL); |
| 204 | X509_ALGOR_get0(NULL, &ptype, (void **)&pval, palg); | 204 | X509_ALGOR_get0(NULL, &ptype, (const void **)&pval, palg); |
| 205 | if (ptype != V_ASN1_SEQUENCE) { | 205 | if (ptype != V_ASN1_SEQUENCE) { |
| 206 | GOSTerror(GOST_R_BAD_KEY_PARAMETERS_FORMAT); | 206 | GOSTerror(GOST_R_BAD_KEY_PARAMETERS_FORMAT); |
| 207 | return 0; | 207 | return 0; |
| @@ -410,7 +410,7 @@ priv_decode_gost01(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf) | |||
| 410 | if (PKCS8_pkey_get0(&palg_obj, &pkey_buf, &priv_len, &palg, p8inf) == 0) | 410 | if (PKCS8_pkey_get0(&palg_obj, &pkey_buf, &priv_len, &palg, p8inf) == 0) |
| 411 | return 0; | 411 | return 0; |
| 412 | (void)EVP_PKEY_assign_GOST(pk, NULL); | 412 | (void)EVP_PKEY_assign_GOST(pk, NULL); |
| 413 | X509_ALGOR_get0(NULL, &ptype, (void **)&pval, palg); | 413 | X509_ALGOR_get0(NULL, &ptype, (const void **)&pval, palg); |
| 414 | if (ptype != V_ASN1_SEQUENCE) { | 414 | if (ptype != V_ASN1_SEQUENCE) { |
| 415 | GOSTerror(GOST_R_BAD_KEY_PARAMETERS_FORMAT); | 415 | GOSTerror(GOST_R_BAD_KEY_PARAMETERS_FORMAT); |
| 416 | return 0; | 416 | return 0; |
