diff options
Diffstat (limited to 'src/lib/libcrypto/evp/evp.h')
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index fa1a98d1a3..381098b96b 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp.h,v 1.118 2023/04/25 18:39:12 tb Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.119 2023/08/25 12:37:33 schwarze Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -310,7 +310,7 @@ typedef struct evp_cipher_info_st { | |||
310 | } EVP_CIPHER_INFO; | 310 | } EVP_CIPHER_INFO; |
311 | 311 | ||
312 | /* Password based encryption function */ | 312 | /* Password based encryption function */ |
313 | typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | 313 | typedef int EVP_PBE_KEYGEN(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, |
314 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); | 314 | ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); |
315 | 315 | ||
316 | #ifndef OPENSSL_NO_RSA | 316 | #ifndef OPENSSL_NO_RSA |
@@ -925,7 +925,7 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | |||
925 | 925 | ||
926 | void PKCS5_PBE_add(void); | 926 | void PKCS5_PBE_add(void); |
927 | 927 | ||
928 | int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen, | 928 | int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, |
929 | ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de); | 929 | ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de); |
930 | 930 | ||
931 | /* PBE type */ | 931 | /* PBE type */ |
@@ -965,8 +965,8 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id, int *ppkey_flags, | |||
965 | const char **pinfo, const char **ppem_str, | 965 | const char **pinfo, const char **ppem_str, |
966 | const EVP_PKEY_ASN1_METHOD *ameth); | 966 | const EVP_PKEY_ASN1_METHOD *ameth); |
967 | 967 | ||
968 | const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(const EVP_PKEY *pkey); | 968 | const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey); |
969 | EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, | 969 | EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, |
970 | const char *info); | 970 | const char *info); |
971 | void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, | 971 | void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, |
972 | const EVP_PKEY_ASN1_METHOD *src); | 972 | const EVP_PKEY_ASN1_METHOD *src); |
@@ -1073,7 +1073,7 @@ void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
1073 | #define EVP_PKEY_FLAG_SIGCTX_CUSTOM 4 | 1073 | #define EVP_PKEY_FLAG_SIGCTX_CUSTOM 4 |
1074 | 1074 | ||
1075 | const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type); | 1075 | const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type); |
1076 | EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags); | 1076 | EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags); |
1077 | void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, | 1077 | void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, |
1078 | const EVP_PKEY_METHOD *meth); | 1078 | const EVP_PKEY_METHOD *meth); |
1079 | void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src); | 1079 | void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src); |