[openssl.org #1098] NetWare patch for 0.9.8-beta3

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[openssl.org #1098] NetWare patch for 0.9.8-beta3

Rich Salz via RT

diff -cr openssl-0.9.8-beta3/Configure openssl-0.9.8-beta3.nw/Configure
*** openssl-0.9.8-beta3/Configure Wed May 18 02:17:26 2005
--- openssl-0.9.8-beta3.nw/Configure Thu Jun  2 11:05:34 2005
***************
*** 484,493 ****
 
  # NetWare from David Ward ([hidden email]) - requires MetroWerks NLM development tools
  # netware-clib => legacy CLib c-runtime support
! "netware-clib", "mwccnlm:::::${x86_gcc_opts}:::",
  # netware-libc => LibC/NKS support
! "netware-libc", "mwccnlm:::::BN_LLONG ${x86_gcc_opts}:::",
! "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall::::${x86_gcc_opts}:::",
 
  # DJGPP
  "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
--- 484,493 ----
 
  # NetWare from David Ward ([hidden email]) - requires MetroWerks NLM development tools
  # netware-clib => legacy CLib c-runtime support
! "netware-clib", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
  # netware-libc => LibC/NKS support
! "netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
! "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
 
  # DJGPP
  "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
diff -cr openssl-0.9.8-beta3/e_os.h openssl-0.9.8-beta3.nw/e_os.h
*** openssl-0.9.8-beta3/e_os.h Sat May 21 07:19:44 2005
--- openssl-0.9.8-beta3.nw/e_os.h Fri Jun  3 14:36:32 2005
***************
*** 438,448 ****
  #  elif defined(OPENSSL_SYS_NETWARE)
           /* NetWare uses the WinSock2 interfaces
           */
! #      if defined(NETWARE_CLIB)
! #        include <ws2nlm.h>
! #      elif defined(NETWARE_LIBC)
! #        include <novsock2.h>
! #      endif
  #      define SSLeay_Write(a,b,c)   send((a),(b),(c),0)
  #      define SSLeay_Read(a,b,c) recv((a),(b),(c),0)
  #      define SHUTDOWN(fd)    { shutdown((fd),0); closesocket(fd); }
--- 438,444 ----
  #  elif defined(OPENSSL_SYS_NETWARE)
           /* NetWare uses the WinSock2 interfaces
           */
! #      include <novsock2.h>
  #      define SSLeay_Write(a,b,c)   send((a),(b),(c),0)
  #      define SSLeay_Read(a,b,c) recv((a),(b),(c),0)
  #      define SHUTDOWN(fd)    { shutdown((fd),0); closesocket(fd); }
Only in openssl-0.9.8-beta3.nw: inc32
diff -cr openssl-0.9.8-beta3/INSTALL.NW openssl-0.9.8-beta3.nw/INSTALL.NW
*** openssl-0.9.8-beta3/INSTALL.NW Mon Jun 28 05:55:28 2004
--- openssl-0.9.8-beta3.nw/INSTALL.NW Fri Jun  3 15:33:10 2005
***************
*** 95,103 ****
           Microsoft SDK.  Note: The winsock2.h support headers may change
           with various versions of winsock2.h.  Check the dependencies
           section on the NDK WinSock2 download page for the latest
!          information on dependencies.
 
 
        NLM and NetWare libraries for C (including CLIB and XPlat):
           If you are going to build a CLIB version of OpenSSL, you will
           need the CLIB headers and imports.  The March, 2001 NDK release or
--- 95,108 ----
           Microsoft SDK.  Note: The winsock2.h support headers may change
           with various versions of winsock2.h.  Check the dependencies
           section on the NDK WinSock2 download page for the latest
!          information on dependencies. These components are unsupported by
!          Novell. They are provided as a courtesy, but it is strongly
!          suggested that all development be done using LIBC, not CLIB.
 
+          As of June 2005, the WinSock2 components are available at:
+          http://forgeftp.novell.com//ws2comp/
 
+
        NLM and NetWare libraries for C (including CLIB and XPlat):
           If you are going to build a CLIB version of OpenSSL, you will
           need the CLIB headers and imports.  The March, 2001 NDK release or
***************
*** 287,299 ****
  The do_tests.pl script generates a log file "\openssl\test_out\tests.log"
  which should be reviewed for errors.  Any errors will be denoted by the word
  "ERROR" in the log.
-
- NOTE:  Currently (11/2002), the LibC test nlms report an error while loading
-        when launched from the perl script (do_tests.pl).  The problems are
-        being addressed by the LibC development team and should be fixed in the
-        next release.  Until the problems are corrected, the LibC test nlms
-        will have to be executed manually.  
-
 
  DEVELOPING WITH THE OPENSSL SDK:
  --------------------------------
--- 292,297 ----
diff -cr openssl-0.9.8-beta3/Netware/do_tests.pl openssl-0.9.8-beta3.nw/Netware/do_tests.pl
*** openssl-0.9.8-beta3/Netware/do_tests.pl Fri Nov 28 06:10:56 2003
--- openssl-0.9.8-beta3.nw/Netware/do_tests.pl Thu Jun  2 11:37:48 2005
***************
*** 42,49 ****
     encryption_tests();
     pem_tests();
     verify_tests();
-    ssl_tests();
     ca_tests();
 
     close(OUT);
 
--- 42,49 ----
     encryption_tests();
     pem_tests();
     verify_tests();
     ca_tests();
+    ssl_tests();
 
     close(OUT);
 
***************
*** 67,76 ****
 
     foreach $i (@tests)
     {
!       $outFile = "$output_path\\$i.out";
!       system("$i > $outFile");
!       log_desc("Test: $i\.nlm:");
!       log_output("", $outFile );
     }
  }
 
--- 67,83 ----
 
     foreach $i (@tests)
     {
!       if (-e "$base_path\\$i.nlm")
!  {
!          $outFile = "$output_path\\$i.out";
!          system("$i > $outFile");
!          log_desc("Test: $i\.nlm:");
!          log_output("", $outFile );
!  }
!  else
!  {
!          log_desc("Test: $i\.nlm: file not found");
!  }
     }
  }
 
***************
*** 246,251 ****
--- 253,262 ----
  sub ssl_tests
  {
     my $outFile = "$output_path\\ssl_tst.out";
+    my($CAcert) = "$output_path\\certCA.ss";
+    my($Ukey)   = "$output_path\\keyU.ss";
+    my($Ucert)  = "$output_path\\certU.ss";
+    my($ssltest)= "ssltest -key $Ukey -cert $Ucert -c_key $Ukey -c_cert $Ucert -CAfile $CAcert";
 
     print( "\nRUNNING SSL TESTS:\n\n");
 
***************
*** 252,306 ****
     print( OUT "\n========================================================\n");
     print( OUT "SSL TESTS:\n\n");
 
-    make_tmp_cert_file();
-
     system("ssltest -ssl2 >$outFile");
     log_desc("Testing sslv2:");
     log_output("ssltest -ssl2", $outFile);
 
!    system("ssltest -ssl2 -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with server authentication:");
!    log_output("ssltest -ssl2 -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -ssl2 -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with client authentication:");
!    log_output("ssltest -ssl2 -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -ssl2 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with both client and server authentication:");
!    log_output("ssltest -ssl2 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
 
     system("ssltest -ssl3 >$outFile");
     log_desc("Testing sslv3:");
     log_output("ssltest -ssl3", $outFile);
 
!    system("ssltest -ssl3 -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with server authentication:");
!    log_output("ssltest -ssl3 -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -ssl3 -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with client authentication:");
!    log_output("ssltest -ssl3 -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -ssl3 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with both client and server authentication:");
!    log_output("ssltest -ssl3 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
 
     system("ssltest >$outFile");
     log_desc("Testing sslv2/sslv3:");
     log_output("ssltest", $outFile);
 
!    system("ssltest -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with server authentication:");
!    log_output("ssltest -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with client authentication:");
!    log_output("ssltest -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with both client and server authentication:");
!    log_output("ssltest -server_auth -client_auth -CAfile $tmp_cert", $outFile);
 
     system("ssltest -bio_pair -ssl2 >$outFile");
     log_desc("Testing sslv2 via BIO pair:");
--- 263,315 ----
     print( OUT "\n========================================================\n");
     print( OUT "SSL TESTS:\n\n");
 
     system("ssltest -ssl2 >$outFile");
     log_desc("Testing sslv2:");
     log_output("ssltest -ssl2", $outFile);
 
!    system("$ssltest -ssl2 -server_auth >$outFile");
     log_desc("Testing sslv2 with server authentication:");
!    log_output("$ssltest -ssl2 -server_auth", $outFile);
 
!    system("$ssltest -ssl2 -client_auth >$outFile");
     log_desc("Testing sslv2 with client authentication:");
!    log_output("$ssltest -ssl2 -client_auth", $outFile);
 
!    system("$ssltest -ssl2 -server_auth -client_auth >$outFile");
     log_desc("Testing sslv2 with both client and server authentication:");
!    log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
 
     system("ssltest -ssl3 >$outFile");
     log_desc("Testing sslv3:");
     log_output("ssltest -ssl3", $outFile);
 
!    system("$ssltest -ssl3 -server_auth >$outFile");
     log_desc("Testing sslv3 with server authentication:");
!    log_output("$ssltest -ssl3 -server_auth", $outFile);
 
!    system("$ssltest -ssl3 -client_auth >$outFile");
     log_desc("Testing sslv3 with client authentication:");
!    log_output("$ssltest -ssl3 -client_auth", $outFile);
 
!    system("$ssltest -ssl3 -server_auth -client_auth >$outFile");
     log_desc("Testing sslv3 with both client and server authentication:");
!    log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile);
 
     system("ssltest >$outFile");
     log_desc("Testing sslv2/sslv3:");
     log_output("ssltest", $outFile);
 
!    system("$ssltest -server_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with server authentication:");
!    log_output("$ssltest -server_auth", $outFile);
 
!    system("$ssltest -client_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with client authentication:");
!    log_output("$ssltest -client_auth ", $outFile);
 
!    system("$ssltest -server_auth -client_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with both client and server authentication:");
!    log_output("$ssltest -server_auth -client_auth", $outFile);
 
     system("ssltest -bio_pair -ssl2 >$outFile");
     log_desc("Testing sslv2 via BIO pair:");
***************
*** 310,358 ****
     log_desc("Testing sslv2/sslv3 with 1024 bit DHE via BIO pair:");
     log_output("ssltest -bio_pair -dhe1024dsa -v", $outFile);
 
!    system("ssltest -bio_pair -ssl2 -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -ssl2 -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -ssl2 -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with client authentication via BIO pair:");
!    log_output("ssltest -bio_pair -ssl2 -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
 
     system("ssltest -bio_pair -ssl3 >$outFile");
     log_desc("Testing sslv3 via BIO pair:");
     log_output("ssltest -bio_pair -ssl3", $outFile);
 
!    system("ssltest -bio_pair -ssl3 -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -ssl3 -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -ssl3 -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with client authentication  via BIO pair:");
!    log_output("ssltest -bio_pair -ssl3 -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
 
     system("ssltest -bio_pair >$outFile");
     log_desc("Testing sslv2/sslv3 via BIO pair:");
     log_output("ssltest -bio_pair", $outFile);
 
!    system("ssltest -bio_pair -server_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -server_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
!    log_output("ssltest -bio_pair -client_auth -CAfile $tmp_cert", $outFile);
 
!    system("ssltest -bio_pair -server_auth -client_auth -CAfile $tmp_cert >$outFile");
     log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
!    log_output("ssltest -bio_pair -server_auth -client_auth -CAfile $tmp_cert", $outFile);
  }
 
 
--- 319,367 ----
     log_desc("Testing sslv2/sslv3 with 1024 bit DHE via BIO pair:");
     log_output("ssltest -bio_pair -dhe1024dsa -v", $outFile);
 
!    system("$ssltest -bio_pair -ssl2 -server_auth >$outFile");
     log_desc("Testing sslv2 with server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
 
!    system("$ssltest -bio_pair -ssl2 -client_auth >$outFile");
     log_desc("Testing sslv2 with client authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
 
!    system("$ssltest -bio_pair -ssl2 -server_auth -client_auth >$outFile");
     log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
 
     system("ssltest -bio_pair -ssl3 >$outFile");
     log_desc("Testing sslv3 via BIO pair:");
     log_output("ssltest -bio_pair -ssl3", $outFile);
 
!    system("$ssltest -bio_pair -ssl3 -server_auth >$outFile");
     log_desc("Testing sslv3 with server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile);
 
!    system("$ssltest -bio_pair -ssl3 -client_auth >$outFile");
     log_desc("Testing sslv3 with client authentication  via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile);
 
!    system("$ssltest -bio_pair -ssl3 -server_auth -client_auth >$outFile");
     log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile);
 
     system("ssltest -bio_pair >$outFile");
     log_desc("Testing sslv2/sslv3 via BIO pair:");
     log_output("ssltest -bio_pair", $outFile);
 
!    system("$ssltest -bio_pair -server_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -server_auth", $outFile);
 
!    system("$ssltest -bio_pair -client_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -client_auth", $outFile);
 
!    system("$ssltest -bio_pair -server_auth -client_auth >$outFile");
     log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
!    log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile);
  }
 
 
diff -cr openssl-0.9.8-beta3/util/pl/netware.pl openssl-0.9.8-beta3.nw/util/pl/netware.pl
*** openssl-0.9.8-beta3/util/pl/netware.pl Fri Nov 28 06:10:38 2003
--- openssl-0.9.8-beta3.nw/util/pl/netware.pl Fri Jun  3 15:29:14 2005
***************
*** 82,91 ****
  #        paths for each subdirectory a recursive include directive
  #        is used ( -ir crypto ).
  #
  #        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
  #        complained a lot about various stuff.  May want to turn back
  #        on for further development.
! $cflags="-ir crypto -msgstyle gcc -align 4 -processor pentium \\
           -char unsigned -w on -w nolargeargs -w nopossible -w nounusedarg \\
           -w noimplicitconv -relax_pointers -nosyspath -DL_ENDIAN \\
           -DOPENSSL_SYSNAME_NETWARE -U_WIN32 -maxerrors 20 ";
--- 82,93 ----
  #        paths for each subdirectory a recursive include directive
  #        is used ( -ir crypto ).
  #
+ #        A similar issue exists for the engines and apps subdirectories.
+ #
  #        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
  #        complained a lot about various stuff.  May want to turn back
  #        on for further development.
! $cflags="-ir crypto -ir engines -ir apps -msgstyle gcc -align 4 -processor pentium \\
           -char unsigned -w on -w nolargeargs -w nopossible -w nounusedarg \\
           -w noimplicitconv -relax_pointers -nosyspath -DL_ENDIAN \\
           -DOPENSSL_SYSNAME_NETWARE -U_WIN32 -maxerrors 20 ";
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
Development Mailing List                       [hidden email]
Automated List Manager                           [hidden email]