import openssl-0.9.7-beta3

2 files changed, 76 insertions, 1 deletions

diff --git a/src/lib/libssl/test/dummytest.c b/src/lib/libssl/test/dummytest.c
new file mode 100644
index 0000000000..f98f003ef9
--- /dev/null
+++ b/src/lib/libssl/test/dummytest.c
@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <openssl/e_os2.h>
+#include <openssl/buffer.h>
+#include <openssl/crypto.h>
+
+int main(int argc, char *argv[])
+        {
+        char *p, *q, *program;
+
+        p = strrchr(argv[0], '/');
+        if (!p) p = strrchr(argv[0], '\\');
+#ifdef OPENSSL_SYS_VMS
+        if (!p) p = strrchr(argv[0], ']');
+        if (p) q = strrchr(p, '>');
+        if (q) p = q;
+        if (!p) p = strrchr(argv[0], ':');
+        q = 0;
+#endif
+        if (p) p++;
+        if (!p) p = argv[0];
+        if (p) q = strchr(p, '.');
+        if (p && !q) q = p + strlen(p);
+
+        if (!p)
+                program = BUF_strdup("(unknown)");
+        else
+                {
+                program = OPENSSL_malloc((q - p) + 1);
+                strncpy(program, p, q - p);
+                program[q - p] = '\0';
+                }
+
+        for(p = program; *p; p++)
+                if (islower(*p)) *p = toupper(*p);
+
+        q = strstr(program, "TEST");
+        if (q > p && q[-1] == '_') q--;
+        *q = '\0';
+
+        printf("No %s support\n", program);
+
+        OPENSSL_free(program);
+        return(0);
+        }
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index f7ff8fe407..b3bf8bb837 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -910,7 +910,8 @@ $ ENDIF
 $!
 $! Time to check the contents, and to make sure we get the correct library.
 $!
-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
+     .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
 $ THEN
 $!
 $!  Check to see if SOCKETSHR was chosen
@@ -959,6 +960,32 @@ $!    Done with UCX
 $!
 $   ENDIF
 $!
+$!  Check to see if TCPIP was chosen
+$!
+$   IF P4.EQS."TCPIP"
+$   THEN
+$!
+$!    Set the library to use TCPIP (post UCX).
+$!
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
+$!
+$!    Done with TCPIP
+$!
+$   ENDIF
+$!
+$!  Check to see if NONE was chosen
+$!
+$   IF P4.EQS."NONE"
+$   THEN
+$!
+$!    Do not use a TCPIP library.
+$!
+$     TCPIP_LIB = ""
+$!
+$!    Done with NONE
+$!
+$   ENDIF
+$!
 $!  Print info
 $!
 $   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -974,6 +1001,7 @@ $   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
 $   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
+$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Time To EXIT.