Inline kdferr.h at the end of kdf.h

author: tb <> 2022-05-04 18:27:39 +0000
committer: tb <> 2022-05-04 18:27:39 +0000
commit: 53402c0b18d31e211b7214ad69d93ea0a2ba5397 (patch)
tree: 97ac8e6ee2b153b8871d32e05a813e8116092625 /src
parent: a2dfafe2b1f4da5d094020925b3c5bd9fc549c43 (diff)
download: openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.tar.gz
openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.tar.bz2
openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.zip
2 files changed, 37 insertions, 55 deletions
diff --git a/src/lib/libcrypto/kdf/kdf.h b/src/lib/libcrypto/kdf/kdf.h
index 5abd4c3714..658a417d63 100644
--- a/src/lib/libcrypto/kdf/kdf.h
+++ b/src/lib/libcrypto/kdf/kdf.h
@@ -90,6 +90,43 @@ extern "C" {
            EVP_PKEY_CTX_ctrl_uint64(pctx, -1, EVP_PKEY_OP_DERIVE, \
                            EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, maxmem_bytes)
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ */
+int ERR_load_KDF_strings(void);
+/*
+ * KDF function codes.
+ */
+# define KDF_F_PKEY_HKDF_CTRL_STR                         103
+# define KDF_F_PKEY_HKDF_DERIVE                           102
+# define KDF_F_PKEY_HKDF_INIT                             108
+# define KDF_F_PKEY_SCRYPT_CTRL_STR                       104
+# define KDF_F_PKEY_SCRYPT_CTRL_UINT64                    105
+# define KDF_F_PKEY_SCRYPT_DERIVE                         109
+# define KDF_F_PKEY_SCRYPT_INIT                           106
+# define KDF_F_PKEY_SCRYPT_SET_MEMBUF                     107
+# define KDF_F_PKEY_TLS1_PRF_CTRL_STR                     100
+# define KDF_F_PKEY_TLS1_PRF_DERIVE                       101
+# define KDF_F_PKEY_TLS1_PRF_INIT                         110
+# define KDF_F_TLS1_PRF_ALG                               111
+/*
+ * KDF reason codes.
+ */
+# define KDF_R_INVALID_DIGEST                             100
+# define KDF_R_MISSING_ITERATION_COUNT                    109
+# define KDF_R_MISSING_KEY                                104
+# define KDF_R_MISSING_MESSAGE_DIGEST                     105
+# define KDF_R_MISSING_PARAMETER                          101
+# define KDF_R_MISSING_PASS                               110
+# define KDF_R_MISSING_SALT                               111
+# define KDF_R_MISSING_SECRET                             107
+# define KDF_R_MISSING_SEED                               106
+# define KDF_R_UNKNOWN_PARAMETER_TYPE                     103
+# define KDF_R_VALUE_ERROR                                108
+# define KDF_R_VALUE_MISSING                              102
 # ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/kdf/kdferr.h b/src/lib/libcrypto/kdf/kdferr.h
deleted file mode 100644
index 3f51bd0228..0000000000
--- a/src/lib/libcrypto/kdf/kdferr.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-#ifndef HEADER_KDFERR_H
-# define HEADER_KDFERR_H
-# ifndef HEADER_SYMHACKS_H
-#  include <openssl/symhacks.h>
-# endif
-# ifdef  __cplusplus
-extern "C"
-# endif
-int ERR_load_KDF_strings(void);
-/*
- * KDF function codes.
- */
-# define KDF_F_PKEY_HKDF_CTRL_STR                         103
-# define KDF_F_PKEY_HKDF_DERIVE                           102
-# define KDF_F_PKEY_HKDF_INIT                             108
-# define KDF_F_PKEY_SCRYPT_CTRL_STR                       104
-# define KDF_F_PKEY_SCRYPT_CTRL_UINT64                    105
-# define KDF_F_PKEY_SCRYPT_DERIVE                         109
-# define KDF_F_PKEY_SCRYPT_INIT                           106
-# define KDF_F_PKEY_SCRYPT_SET_MEMBUF                     107
-# define KDF_F_PKEY_TLS1_PRF_CTRL_STR                     100
-# define KDF_F_PKEY_TLS1_PRF_DERIVE                       101
-# define KDF_F_PKEY_TLS1_PRF_INIT                         110
-# define KDF_F_TLS1_PRF_ALG                               111
-/*
- * KDF reason codes.
- */
-# define KDF_R_INVALID_DIGEST                             100
-# define KDF_R_MISSING_ITERATION_COUNT                    109
-# define KDF_R_MISSING_KEY                                104
-# define KDF_R_MISSING_MESSAGE_DIGEST                     105
-# define KDF_R_MISSING_PARAMETER                          101
-# define KDF_R_MISSING_PASS                               110
-# define KDF_R_MISSING_SALT                               111
-# define KDF_R_MISSING_SECRET                             107
-# define KDF_R_MISSING_SEED                               106
-# define KDF_R_UNKNOWN_PARAMETER_TYPE                     103
-# define KDF_R_VALUE_ERROR                                108
-# define KDF_R_VALUE_MISSING                              102
-#endif
author	tb <>	2022-05-04 18:27:39 +0000
committer	tb <>	2022-05-04 18:27:39 +0000
commit	53402c0b18d31e211b7214ad69d93ea0a2ba5397 (patch)
tree	97ac8e6ee2b153b8871d32e05a813e8116092625 /src
parent	a2dfafe2b1f4da5d094020925b3c5bd9fc549c43 (diff)
download	openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.tar.gz openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.tar.bz2 openbsd-53402c0b18d31e211b7214ad69d93ea0a2ba5397.zip

diff --git a/src/lib/libcrypto/kdf/kdf.h b/src/lib/libcrypto/kdf/kdf.h index 5abd4c3714..658a417d63 100644 --- a/src/lib/libcrypto/kdf/kdf.h +++ b/src/lib/libcrypto/kdf/kdf.h
@@ -90,6 +90,43 @@ extern "C" {
90	EVP_PKEY_CTX_ctrl_uint64(pctx, -1, EVP_PKEY_OP_DERIVE, \	90	EVP_PKEY_CTX_ctrl_uint64(pctx, -1, EVP_PKEY_OP_DERIVE, \
91	EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, maxmem_bytes)	91	EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, maxmem_bytes)
92		92
		93	/*
		94	* Generated by util/mkerr.pl DO NOT EDIT
		95	*/
		96
		97	int ERR_load_KDF_strings(void);
		98
		99	/*
		100	* KDF function codes.
		101	*/
		102	# define KDF_F_PKEY_HKDF_CTRL_STR 103
		103	# define KDF_F_PKEY_HKDF_DERIVE 102
		104	# define KDF_F_PKEY_HKDF_INIT 108
		105	# define KDF_F_PKEY_SCRYPT_CTRL_STR 104
		106	# define KDF_F_PKEY_SCRYPT_CTRL_UINT64 105
		107	# define KDF_F_PKEY_SCRYPT_DERIVE 109
		108	# define KDF_F_PKEY_SCRYPT_INIT 106
		109	# define KDF_F_PKEY_SCRYPT_SET_MEMBUF 107
		110	# define KDF_F_PKEY_TLS1_PRF_CTRL_STR 100
		111	# define KDF_F_PKEY_TLS1_PRF_DERIVE 101
		112	# define KDF_F_PKEY_TLS1_PRF_INIT 110
		113	# define KDF_F_TLS1_PRF_ALG 111
		114
		115	/*
		116	* KDF reason codes.
		117	*/
		118	# define KDF_R_INVALID_DIGEST 100
		119	# define KDF_R_MISSING_ITERATION_COUNT 109
		120	# define KDF_R_MISSING_KEY 104
		121	# define KDF_R_MISSING_MESSAGE_DIGEST 105
		122	# define KDF_R_MISSING_PARAMETER 101
		123	# define KDF_R_MISSING_PASS 110
		124	# define KDF_R_MISSING_SALT 111
		125	# define KDF_R_MISSING_SECRET 107
		126	# define KDF_R_MISSING_SEED 106
		127	# define KDF_R_UNKNOWN_PARAMETER_TYPE 103
		128	# define KDF_R_VALUE_ERROR 108
		129	# define KDF_R_VALUE_MISSING 102
93		130
94	# ifdef __cplusplus	131	# ifdef __cplusplus
95	}	132	}


diff --git a/src/lib/libcrypto/kdf/kdferr.h b/src/lib/libcrypto/kdf/kdferr.h deleted file mode 100644 index 3f51bd0228..0000000000 --- a/src/lib/libcrypto/kdf/kdferr.h +++ /dev/null
@@ -1,55 +0,0 @@
1	/*
2	* Generated by util/mkerr.pl DO NOT EDIT
3	* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
4	*
5	* Licensed under the OpenSSL license (the "License"). You may not use
6	* this file except in compliance with the License. You can obtain a copy
7	* in the file LICENSE in the source distribution or at
8	* https://www.openssl.org/source/license.html
9	*/
10
11	#ifndef HEADER_KDFERR_H
12	# define HEADER_KDFERR_H
13
14	# ifndef HEADER_SYMHACKS_H
15	# include <openssl/symhacks.h>
16	# endif
17
18	# ifdef __cplusplus
19	extern "C"
20	# endif
21	int ERR_load_KDF_strings(void);
22
23	/*
24	* KDF function codes.
25	*/
26	# define KDF_F_PKEY_HKDF_CTRL_STR 103
27	# define KDF_F_PKEY_HKDF_DERIVE 102
28	# define KDF_F_PKEY_HKDF_INIT 108
29	# define KDF_F_PKEY_SCRYPT_CTRL_STR 104
30	# define KDF_F_PKEY_SCRYPT_CTRL_UINT64 105
31	# define KDF_F_PKEY_SCRYPT_DERIVE 109
32	# define KDF_F_PKEY_SCRYPT_INIT 106
33	# define KDF_F_PKEY_SCRYPT_SET_MEMBUF 107
34	# define KDF_F_PKEY_TLS1_PRF_CTRL_STR 100
35	# define KDF_F_PKEY_TLS1_PRF_DERIVE 101
36	# define KDF_F_PKEY_TLS1_PRF_INIT 110
37	# define KDF_F_TLS1_PRF_ALG 111
38
39	/*
40	* KDF reason codes.
41	*/
42	# define KDF_R_INVALID_DIGEST 100
43	# define KDF_R_MISSING_ITERATION_COUNT 109
44	# define KDF_R_MISSING_KEY 104
45	# define KDF_R_MISSING_MESSAGE_DIGEST 105
46	# define KDF_R_MISSING_PARAMETER 101
47	# define KDF_R_MISSING_PASS 110
48	# define KDF_R_MISSING_SALT 111
49	# define KDF_R_MISSING_SECRET 107
50	# define KDF_R_MISSING_SEED 106
51	# define KDF_R_UNKNOWN_PARAMETER_TYPE 103
52	# define KDF_R_VALUE_ERROR 108
53	# define KDF_R_VALUE_MISSING 102
54
55	#endif