[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  23103a52e96d6126400ca135421e67c7d664dfe5 (commit)
       via  6a15d5b637638c37046d90c02e717543fa63f6da (commit)
       via  027609f9563014a6f5bc6917f085bd77e8dc8dc7 (commit)
      from  928933f92fa214fb8b4f9bbcd242ad2c3d16d46f (commit)


- Log -----------------------------------------------------------------
commit 23103a52e96d6126400ca135421e67c7d664dfe5
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 12 15:17:42 2017 +0100

    UI documentation fixup
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2218)

commit 6a15d5b637638c37046d90c02e717543fa63f6da
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 12 13:07:39 2017 +0100

    UI: fix uitest for VMS
    
    - On VMS, apps/apps.c depends on apps/vms_term_sock.c, so add it to
      the build
    - On VMS, apps/*.c are compiled with default symbol settings,
      i.e. uppercased and truncated symbols, which differs from test
      programs.  Make sure uitest.c knows that with a few pragmas.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2218)

commit 027609f9563014a6f5bc6917f085bd77e8dc8dc7
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 12 11:08:36 2017 +0100

    UI: fix uitest for no-ui configuration
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2218)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/UI_UTIL_read_pw.pod |  5 ++---
 test/build.info              |  6 +++++-
 test/uitest.c                | 26 +++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/doc/man3/UI_UTIL_read_pw.pod b/doc/man3/UI_UTIL_read_pw.pod
index f0b4a69..5c88001 100644
--- a/doc/man3/UI_UTIL_read_pw.pod
+++ b/doc/man3/UI_UTIL_read_pw.pod
@@ -3,7 +3,7 @@
 =head1 NAME
 
 UI_UTIL_read_pw_string, UI_UTIL_read_pw,
-*UI_UTIL_wrap_read_pem_callback - user interface utilities
+UI_UTIL_wrap_read_pem_callback - user interface utilities
 
 =head1 SYNOPSIS
 
@@ -13,8 +13,7 @@ UI_UTIL_read_pw_string, UI_UTIL_read_pw,
                             int verify);
  int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
                      int verify);
- UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int
- rwflag);
+ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag);
 
 =head1 DESCRIPTION
 
diff --git a/test/build.info b/test/build.info
index eed8aa5..c116238 100644
--- a/test/build.info
+++ b/test/build.info
@@ -5,6 +5,9 @@
          my ($base, $files) = @_;
          return join(" ", map { "$base/$_" } split(/\s+/, $files));
      }
+     our $apps_extra =
+         $config{target} =~ /^vms-/ ? "../apps/vms_term_sock.c" : "";
+     ""
 -}
 IF[{- !$disabled{tests} -}]
   PROGRAMS_NO_INST=\
@@ -316,7 +319,8 @@ IF[{- !$disabled{tests} -}]
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl
   ENDIF
 
-  SOURCE[uitest]=uitest.c testutil.c test_main_custom.c ../apps/apps.c ../apps/opt.c
+  SOURCE[uitest]=uitest.c testutil.c test_main_custom.c \
+    ../apps/apps.c ../apps/opt.c {- $apps_extra -}
   INCLUDE[uitest]=.. ../include
   DEPEND[uitest]=../libcrypto ../libssl
 
diff --git a/test/uitest.c b/test/uitest.c
index 84fe71b..0a7420d 100644
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -9,10 +9,27 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <openssl/opensslconf.h>
 #include <openssl/err.h>
-#include <openssl/ui.h>
+
+/*
+ * We know that on VMS, the [.apps] object files are compiled with uppercased
+ * symbols.  We must therefore follow suit, or there will be linking errors.
+ * Additionally, the VMS build does stdio via a socketpair.
+ */
+#ifdef __VMS
+# pragma names save
+# pragma names uppercase, truncated
+
+# include "../apps/vms_term_sock.h"
+#endif
+
 #include "../apps/apps.h"
 
+#ifdef __VMS
+# pragma names restore
+#endif
+
 #include "testutil.h"
 #include "test_main_custom.h"
 
@@ -20,6 +37,9 @@
 char *default_config_file = NULL;
 BIO *bio_err = NULL;
 
+#ifndef OPENSSL_NO_UI
+# include <openssl/ui.h>
+
 /* Old style PEM password callback */
 static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata)
 {
@@ -99,14 +119,18 @@ static int test_new_ui()
     return ok;
 }
 
+#endif
+
 int test_main(int argc, char *argv[])
 {
     int ret;
 
     bio_err = dup_bio_err(FORMAT_TEXT);
 
+#ifndef OPENSSL_NO_UI
     ADD_TEST(test_old);
     ADD_TEST(test_new_ui);
+#endif
 
     ret = run_tests(argv[0]);