diff options
Diffstat (limited to 'src/lib/libcrypto/pem')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_info.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pem_pkey.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/pem/pvkfmt.c | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index 33c1de43fd..aecdbb2e05 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_info.c,v 1.24 2020/07/25 11:53:37 schwarze Exp $ */ | 1 | /* $OpenBSD: pem_info.c,v 1.25 2021/12/12 21:30:14 tb 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 | * |
| @@ -75,6 +75,8 @@ | |||
| 75 | #include <openssl/rsa.h> | 75 | #include <openssl/rsa.h> |
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | #include "evp_locl.h" | ||
| 79 | |||
| 78 | STACK_OF(X509_INFO) * | 80 | STACK_OF(X509_INFO) * |
| 79 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, | 81 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, |
| 80 | void *u) | 82 | void *u) |
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index f0126790e9..7b7f81092e 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_lib.c,v 1.49 2019/09/06 17:41:05 jsing Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.50 2021/12/12 21:30:14 tb 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 | * |
| @@ -79,6 +79,7 @@ | |||
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | #include "asn1_locl.h" | 81 | #include "asn1_locl.h" |
| 82 | #include "evp_locl.h" | ||
| 82 | 83 | ||
| 83 | #define MIN_LENGTH 4 | 84 | #define MIN_LENGTH 4 |
| 84 | 85 | ||
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c index 89181a25f7..8f4fba2f8e 100644 --- a/src/lib/libcrypto/pem/pem_pkey.c +++ b/src/lib/libcrypto/pem/pem_pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_pkey.c,v 1.23 2017/05/02 03:59:44 deraadt Exp $ */ | 1 | /* $OpenBSD: pem_pkey.c,v 1.24 2021/12/12 21:30:14 tb 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 | * |
| @@ -74,6 +74,7 @@ | |||
| 74 | #endif | 74 | #endif |
| 75 | 75 | ||
| 76 | #include "asn1_locl.h" | 76 | #include "asn1_locl.h" |
| 77 | #include "evp_locl.h" | ||
| 77 | 78 | ||
| 78 | int pem_check_suffix(const char *pem_str, const char *suffix); | 79 | int pem_check_suffix(const char *pem_str, const char *suffix); |
| 79 | 80 | ||
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c index abb7f7eec9..9d758ab289 100644 --- a/src/lib/libcrypto/pem/pvkfmt.c +++ b/src/lib/libcrypto/pem/pvkfmt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pvkfmt.c,v 1.22 2019/07/08 11:56:18 inoguchi Exp $ */ | 1 | /* $OpenBSD: pvkfmt.c,v 1.23 2021/12/12 21:30:14 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2005. | 3 | * project 2005. |
| 4 | */ | 4 | */ |
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <openssl/rsa.h> | 74 | #include <openssl/rsa.h> |
| 75 | 75 | ||
| 76 | #include "bn_lcl.h" | 76 | #include "bn_lcl.h" |
| 77 | #include "evp_locl.h" | ||
| 77 | 78 | ||
| 78 | /* Utility function: read a DWORD (4 byte unsigned integer) in little endian | 79 | /* Utility function: read a DWORD (4 byte unsigned integer) in little endian |
| 79 | * format | 80 | * format |
