summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2023-08-25 12:37:33 +0000
committerschwarze <>2023-08-25 12:37:33 +0000
commitb85d8476c405a45be47e5c1b7616f15b8f2f31a6 (patch)
tree85c857d80108baca0bc656ccbea65537c048cc79
parente2a57b655c4b3eec8bbc5b212944e20daba3edd4 (diff)
downloadopenbsd-b85d8476c405a45be47e5c1b7616f15b8f2f31a6.tar.gz
openbsd-b85d8476c405a45be47e5c1b7616f15b8f2f31a6.tar.bz2
openbsd-b85d8476c405a45be47e5c1b7616f15b8f2f31a6.zip
KNF, no assembly change
OK tb@ jsing@
Diffstat
-rw-r--r--src/lib/libcrypto/bio/bio.h22
-rw-r--r--src/lib/libcrypto/evp/evp.h12
2 files changed, 15 insertions, 19 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 8450780f69..b955524c45 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio.h,v 1.59 2023/07/28 09:58:30 tb Exp $ */ 1/* $OpenBSD: bio.h,v 1.60 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 *
@@ -524,9 +524,8 @@ int BIO_ctrl_reset_read_request(BIO *b);
524/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */ 524/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
525int BIO_set_ex_data(BIO *bio, int idx, void *data); 525int BIO_set_ex_data(BIO *bio, int idx, void *data);
526void *BIO_get_ex_data(BIO *bio, int idx); 526void *BIO_get_ex_data(BIO *bio, int idx);
527int 527int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
528BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, 528 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
529CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
530unsigned long BIO_number_read(BIO *bio); 529unsigned long BIO_number_read(BIO *bio);
531unsigned long BIO_number_written(BIO *bio); 530unsigned long BIO_number_written(BIO *bio);
532 531
@@ -600,12 +599,10 @@ int BIO_dgram_non_fatal_error(int _error);
600 599
601int BIO_fd_should_retry(int i); 600int BIO_fd_should_retry(int i);
602int BIO_fd_non_fatal_error(int _error); 601int BIO_fd_non_fatal_error(int _error);
603int 602int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
604BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), 603 void *u, const char *s, int len);
605void *u, const char *s, int len); 604int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
606int 605 void *u, const char *s, int len, int indent);
607BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
608void *u, const char *s, int len, int indent);
609int BIO_dump(BIO *b, const char *bytes, int len); 606int BIO_dump(BIO *b, const char *bytes, int len);
610int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent); 607int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
611int BIO_dump_fp(FILE *fp, const char *s, int len); 608int BIO_dump_fp(FILE *fp, const char *s, int len);
@@ -636,9 +633,8 @@ BIO *BIO_new_fd(int fd, int close_flag);
636BIO *BIO_new_connect(const char *host_port); 633BIO *BIO_new_connect(const char *host_port);
637BIO *BIO_new_accept(const char *host_port); 634BIO *BIO_new_accept(const char *host_port);
638 635
639int 636int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
640BIO_new_bio_pair(BIO **bio1, size_t writebuf1, 637 BIO **bio2, size_t writebuf2);
641BIO **bio2, size_t writebuf2);
642/* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints. 638/* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
643 * Otherwise returns 0 and sets *bio1 and *bio2 to NULL. 639 * Otherwise returns 0 and sets *bio1 and *bio2 to NULL.
644 * Size 0 uses default value. 640 * Size 0 uses default value.
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 */
313typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 313typedef 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
926void PKCS5_PBE_add(void); 926void PKCS5_PBE_add(void);
927 927
928int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen, 928int 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
968const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(const EVP_PKEY *pkey); 968const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey);
969EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, 969EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags, const char *pem_str,
970 const char *info); 970 const char *info);
971void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 971void 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
1075const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type); 1075const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
1076EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags); 1076EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
1077void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags, 1077void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
1078 const EVP_PKEY_METHOD *meth); 1078 const EVP_PKEY_METHOD *meth);
1079void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src); 1079void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 17:42:49 +0000