This commit was generated by cvs2git to track changes on a CVS vendor

branch.

8 files changed, 245 insertions, 6 deletions

diff --git a/src/lib/libcrypto/util/dirname.pl b/src/lib/libcrypto/util/dirname.pl
new file mode 100644
index 0000000000..d7a66d96ac
--- /dev/null
+++ b/src/lib/libcrypto/util/dirname.pl
@@ -0,0 +1,18 @@
+#!/usr/local/bin/perl
+
+if ($#ARGV < 0) {
+    die "dirname.pl: too few arguments\n";
+} elsif ($#ARGV > 0) {
+    die "dirname.pl: too many arguments\n";
+}
+
+my $d = $ARGV[0];
+
+if ($d =~ m|.*/.*|) {
+    $d =~ s|/[^/]*$||;
+} else {
+    $d = ".";
+}
+
+print $d,"\n";
+exit(0);
diff --git a/src/lib/libcrypto/util/pod2mantest b/src/lib/libcrypto/util/pod2mantest
index 79aefafac0..e01c6192a7 100644
--- a/src/lib/libcrypto/util/pod2mantest
+++ b/src/lib/libcrypto/util/pod2mantest
@@ -11,9 +11,10 @@
 
 
 IFS=:
-try_without_dir=true
+if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
+try_without_dir=false
 # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy:$PATH; do
+for dir in dummy${IFS}$PATH; do
     if [ "$try_without_dir" = true ]; then
       # first iteration
       pod2man=pod2man
@@ -47,7 +48,7 @@ done
 echo "No working pod2man found.  Consider installing a new version." >&2
 if [ "$1" = ignore ]; then
   echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
-  echo "util/pod2man.pl"
+  echo "../../util/pod2man.pl"
   exit 0
 fi
 exit 1
diff --git a/src/lib/libssl/src/INSTALL.DJGPP b/src/lib/libssl/src/INSTALL.DJGPP
new file mode 100644
index 0000000000..0120b946b5
--- /dev/null
+++ b/src/lib/libssl/src/INSTALL.DJGPP
@@ -0,0 +1,32 @@
+
+ 
+ INSTALLATION ON THE DOS PLATFORM WITH DJGPP
+ -------------------------------------------
+
+ Openssl has been ported to DOS, but only with long filename support. If
+ you wish to compile on native DOS with 8+3 filenames, you will have to
+ tweak the installation yourself, including renaming files with illegal
+ or duplicate names.
+
+ You should have a full DJGPP environment installed, including the
+ latest versions of DJGPP, GCC, BINUTILS, BASH, etc. This package
+ requires that PERL and BC also be installed.
+
+ All of these can be obtained from the usual DJGPP mirror sites, such as
+ "ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp". You also need to have
+ the WATT-32 networking package installed before you try to compile
+ openssl. This can be obtained from "http://www.bgnett.no/~giva/". The
+ Makefile assumes that the WATT-32 code is in directory "watt32" under
+ /dev/env/DJDIR.
+
+ To compile openssl, start your BASH shell. Then configure for DOS by
+ running "./Configure" with appropriate arguments. The basic syntax for
+ DOS is:
+ ./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
+ 
+ You may run out of DPMI selectors when running in a DOS box under
+ Windows. If so, just close the BASH shell, go back to Windows, and
+ restart BASH. Then run "make" again.
+
+ Building openssl under DJGPP has been tested with DJGPP 2.03,
+ GCC 2.952, GCC 2.953, perl 5.005_02 and perl 5.006_01.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_do_handshake.pod b/src/lib/libssl/src/doc/ssl/SSL_do_handshake.pod
new file mode 100644
index 0000000000..243576451b
--- /dev/null
+++ b/src/lib/libssl/src/doc/ssl/SSL_do_handshake.pod
@@ -0,0 +1,75 @@
+=pod
+
+=head1 NAME
+
+SSL_do_handshake - perform a TLS/SSL handshake
+
+=head1 SYNOPSIS
+
+ #include <openssl/ssl.h>
+
+ int SSL_do_handshake(SSL *ssl);
+
+=head1 DESCRIPTION
+
+SSL_do_handshake() will wait for a SSL/TLS handshake to take place. If the
+connection is in client mode, the handshake will be started. The handshake
+routines may have to be explicitly set in advance using either
+L<SSL_set_connect_state(3)|SSL_set_connect_state(3)> or
+L<SSL_set_accept_state(3)|SSL_set_accept_state(3)>.
+
+=head1 NOTES
+
+The behaviour of SSL_do_handshake() depends on the underlying BIO.
+
+If the underlying BIO is B<blocking>, SSL_do_handshake() will only return
+once the handshake has been finished or an error occurred, except for SGC
+(Server Gated Cryptography). For SGC, SSL_do_handshake() may return with -1,
+but SSL_get_error() will yield B<SSL_ERROR_WANT_READ/WRITE> and
+SSL_do_handshake() should be called again.
+
+If the underlying BIO is B<non-blocking>, SSL_do_handshake() will also return
+when the underlying BIO could not satisfy the needs of SSL_do_handshake()
+to continue the handshake. In this case a call to SSL_get_error() with the
+return value of SSL_do_handshake() will yield B<SSL_ERROR_WANT_READ> or
+B<SSL_ERROR_WANT_WRITE>. The calling process then must repeat the call after
+taking appropriate action to satisfy the needs of SSL_do_handshake().
+The action depends on the underlying BIO. When using a non-blocking socket,
+nothing is to be done, but select() can be used to check for the required
+condition. When using a buffering BIO, like a BIO pair, data must be written
+into or retrieved out of the BIO before being able to continue.
+
+=head1 RETURN VALUES
+
+The following return values can occur:
+
+=over 4
+
+=item 1
+
+The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+established.
+
+=item 0
+
+The TLS/SSL handshake was not successful but was shut down controlled and
+by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+return value B<ret> to find out the reason.
+
+=item E<lt>0
+
+The TLS/SSL handshake was not successful because a fatal error occurred either
+at the protocol level or a connection failure occurred. The shutdown was
+not clean. It can also occur of action is need to continue the operation
+for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
+to find out the reason.
+
+=back
+
+=head1 SEE ALSO
+
+L<SSL_get_error(3)|SSL_get_error(3)>, L<SSL_connect(3)|SSL_connect(3)>,
+L<SSL_accept(3)|SSL_accept(3)>, L<ssl(3)|ssl(3)>, L<bio(3)|bio(3)>,
+L<SSL_set_connect_state(3)|SSL_set_connect_state(3)>
+
+=cut
diff --git a/src/lib/libssl/src/test/dummytest.c b/src/lib/libssl/src/test/dummytest.c
new file mode 100644
index 0000000000..f98f003ef9
--- /dev/null
+++ b/src/lib/libssl/src/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/src/util/dirname.pl b/src/lib/libssl/src/util/dirname.pl
new file mode 100644
index 0000000000..d7a66d96ac
--- /dev/null
+++ b/src/lib/libssl/src/util/dirname.pl
@@ -0,0 +1,18 @@
+#!/usr/local/bin/perl
+
+if ($#ARGV < 0) {
+    die "dirname.pl: too few arguments\n";
+} elsif ($#ARGV > 0) {
+    die "dirname.pl: too many arguments\n";
+}
+
+my $d = $ARGV[0];
+
+if ($d =~ m|.*/.*|) {
+    $d =~ s|/[^/]*$||;
+} else {
+    $d = ".";
+}
+
+print $d,"\n";
+exit(0);
diff --git a/src/lib/libssl/src/util/pod2mantest b/src/lib/libssl/src/util/pod2mantest
index 79aefafac0..e01c6192a7 100644
--- a/src/lib/libssl/src/util/pod2mantest
+++ b/src/lib/libssl/src/util/pod2mantest
@@ -11,9 +11,10 @@
 
 
 IFS=:
-try_without_dir=true
+if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
+try_without_dir=false
 # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy:$PATH; do
+for dir in dummy${IFS}$PATH; do
     if [ "$try_without_dir" = true ]; then
       # first iteration
       pod2man=pod2man
@@ -47,7 +48,7 @@ done
 echo "No working pod2man found.  Consider installing a new version." >&2
 if [ "$1" = ignore ]; then
   echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
-  echo "util/pod2man.pl"
+  echo "../../util/pod2man.pl"
   exit 0
 fi
 exit 1
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);
+        }