diff options
| -rw-r--r-- | crypto/ui/build.info | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_null.c | 26 | ||||
| -rw-r--r-- | doc/man3/UI_new.pod | 6 | ||||
| -rw-r--r-- | include/openssl/ui.h | 6 | ||||
| -rw-r--r-- | util/libcrypto.num | 1 |
5 files changed, 39 insertions, 2 deletions
diff --git a/crypto/ui/build.info b/crypto/ui/build.info index fcb45af7eb..c5d17fb744 100644 --- a/crypto/ui/build.info +++ b/crypto/ui/build.info @@ -1,3 +1,3 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ - ui_err.c ui_lib.c ui_openssl.c ui_util.c + ui_err.c ui_lib.c ui_openssl.c ui_null.c ui_util.c diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c new file mode 100644 index 0000000000..9e5f6fca59 --- /dev/null +++ b/crypto/ui/ui_null.c @@ -0,0 +1,26 @@ +/* + * Copyright 2017 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 + */ + +#include "ui_locl.h" + +static const UI_METHOD ui_null = { + "OpenSSL NULL UI", + NULL, /* opener */ + NULL, /* writer */ + NULL, /* flusher */ + NULL, /* reader */ + NULL, /* closer */ + NULL +}; + +/* The method with all the built-in thingies */ +const UI_METHOD *UI_null(void) +{ + return &ui_null; +} diff --git a/doc/man3/UI_new.pod b/doc/man3/UI_new.pod index dedf4dc94a..08400d3492 100644 --- a/doc/man3/UI_new.pod +++ b/doc/man3/UI_new.pod @@ -9,7 +9,7 @@ UI_dup_input_boolean, UI_add_info_string, UI_dup_info_string, UI_add_error_string, UI_dup_error_string, UI_construct_prompt, UI_add_user_data, UI_get0_user_data, UI_get0_result, UI_process, UI_ctrl, UI_set_default_method, UI_get_default_method, UI_get_method, -UI_set_method, UI_OpenSSL, - user interface +UI_set_method, UI_OpenSSL, UI_null - user interface =head1 SYNOPSIS @@ -59,6 +59,7 @@ UI_set_method, UI_OpenSSL, - user interface const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth); UI_METHOD *UI_OpenSSL(void); + const UI_METHOD *UI_null(void); =head1 DESCRIPTION @@ -177,6 +178,9 @@ UI_set_method() changes the UI method associated with a given UI. UI_OpenSSL() is the default OpenSSL UI method for prompting passphrases on the command line. +UI_null() is a UI method that does nothing. Its use is to avoid +getting internal defaults for passed UI_METHOD pointers. + =head1 COPYRIGHT Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. diff --git a/include/openssl/ui.h b/include/openssl/ui.h index c5718d23e2..a5fedb5d76 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -206,6 +206,12 @@ const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth); /* The method with all the built-in thingies */ UI_METHOD *UI_OpenSSL(void); +/* + * NULL method. Literarily does nothing, but may serve as a placeholder + * to avoid internal default. + */ +const UI_METHOD *UI_null(void); + /* ---------- For method writers ---------- */ /*- A method contains a number of functions that implement the low level diff --git a/util/libcrypto.num b/util/libcrypto.num index 79dddd1ac0..363ab6610c 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4252,3 +4252,4 @@ EVP_aria_256_ecb 4202 1_1_1 EXIST::FUNCTION:ARIA EVP_aria_256_ctr 4203 1_1_1 EXIST::FUNCTION:ARIA EVP_aria_128_ctr 4204 1_1_1 EXIST::FUNCTION:ARIA EVP_aria_192_ctr 4205 1_1_1 EXIST::FUNCTION:ARIA +UI_null 4206 1_1_1 EXIST::FUNCTION:UI |