diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-17 21:27:57 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-17 21:27:57 +0000 |
| commit | aa144ced5d61b5c7fb74acaebb37d85bd08f0416 (patch) | |
| tree | 2de6902cff4b007f4fae30a7d6c546b4dd3d1740 /crypto/ui | |
| parent | fbc3ad1ae1976eb5f2bac351260f2c5ee255c27f (diff) | |
Notes
Diffstat (limited to 'crypto/ui')
| -rw-r--r-- | crypto/ui/ui_lib.c | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_local.h (renamed from crypto/ui/ui_locl.h) | 4 | ||||
| -rw-r--r-- | crypto/ui/ui_null.c | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_util.c | 5 |
5 files changed, 8 insertions, 7 deletions
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index f550972d3eec..49cc45057c4c 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -13,7 +13,7 @@ #include <openssl/buffer.h> #include <openssl/ui.h> #include <openssl/err.h> -#include "ui_locl.h" +#include "ui_local.h" UI *UI_new(void) { diff --git a/crypto/ui/ui_locl.h b/crypto/ui/ui_local.h index 19b33b8fc677..8a7dbda14721 100644 --- a/crypto/ui/ui_locl.h +++ b/crypto/ui/ui_local.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_UI_LOCL_H -# define HEADER_UI_LOCL_H +#ifndef OSSL_CRYPTO_UI_LOCAL_H +# define OSSL_CRYPTO_UI_LOCAL_H # include <openssl/ui.h> # include <openssl/crypto.h> diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c index 9e5f6fca59e5..9ab00e0a7cb8 100644 --- a/crypto/ui/ui_null.c +++ b/crypto/ui/ui_null.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ui_locl.h" +#include "ui_local.h" static const UI_METHOD ui_null = { "OpenSSL NULL UI", diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 0ec9f0daf333..168de4630dcc 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -53,7 +53,7 @@ # endif # endif -# include "ui_locl.h" +# include "ui_local.h" # include "internal/cryptlib.h" # ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */ diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c index b379324f9bab..32a3c4e38de2 100644 --- a/crypto/ui/ui_util.c +++ b/crypto/ui/ui_util.c @@ -8,8 +8,9 @@ */ #include <string.h> +#include <openssl/pem.h> /* PEM_def_callback() */ #include "internal/thread_once.h" -#include "ui_locl.h" +#include "ui_local.h" #ifndef BUFSIZ #define BUFSIZ 256 @@ -156,7 +157,7 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag) return NULL; } data->rwflag = rwflag; - data->cb = cb; + data->cb = cb != NULL ? cb : PEM_def_callback; return ui_method; } |