diff options
Diffstat (limited to 'src/lib/libcrypto/dh')
-rw-r--r-- | src/lib/libcrypto/dh/dh.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h index 4e4fdcd982..7b226a70c8 100644 --- a/src/lib/libcrypto/dh/dh.h +++ b/src/lib/libcrypto/dh/dh.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dh.h,v 1.34 2022/07/07 13:01:28 tb Exp $ */ | 1 | /* $OpenBSD: dh.h,v 1.35 2022/07/12 14:42:49 kn 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 | * |
@@ -196,10 +196,6 @@ int DHparams_print(char *bp, const DH *x); | |||
196 | #define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR (EVP_PKEY_ALG_CTRL + 2) | 196 | #define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR (EVP_PKEY_ALG_CTRL + 2) |
197 | 197 | ||
198 | 198 | ||
199 | /* BEGIN ERROR CODES */ | ||
200 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
201 | * made after this point may be overwritten when the script is next run. | ||
202 | */ | ||
203 | void ERR_load_DH_strings(void); | 199 | void ERR_load_DH_strings(void); |
204 | 200 | ||
205 | /* Error codes for the DH functions. */ | 201 | /* Error codes for the DH functions. */ |
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c index a387c37cca..db66d68e3b 100644 --- a/src/lib/libcrypto/dh/dh_err.c +++ b/src/lib/libcrypto/dh/dh_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dh_err.c,v 1.17 2022/01/10 12:00:52 tb Exp $ */ | 1 | /* $OpenBSD: dh_err.c,v 1.18 2022/07/12 14:42:49 kn Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,11 +53,6 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
57 | * made to it will be overwritten when the script next updates this file, | ||
58 | * only reason strings will be preserved. | ||
59 | */ | ||
60 | |||
61 | #include <stdio.h> | 56 | #include <stdio.h> |
62 | 57 | ||
63 | #include <openssl/opensslconf.h> | 58 | #include <openssl/opensslconf.h> |
@@ -65,7 +60,6 @@ | |||
65 | #include <openssl/err.h> | 60 | #include <openssl/err.h> |
66 | #include <openssl/dh.h> | 61 | #include <openssl/dh.h> |
67 | 62 | ||
68 | /* BEGIN ERROR CODES */ | ||
69 | #ifndef OPENSSL_NO_ERR | 63 | #ifndef OPENSSL_NO_ERR |
70 | 64 | ||
71 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) | 65 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) |