Commit 14023fe3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Merge from 1.0.0-stable branch.

parent b6b0b0d7

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 0.9.8k and 1.0  [xx XXX xxxx]



  *) Alter match criteria in PKCS12_parse(). It used to try to use local

     key ids to find matching certificates and keys but some PKCS#12 files

     don't follow the (somewhat unwritten) rules and this strategy fails.

     Now just gather all certificates together and the first private key

     then look for the first certificate that matches the key.

     [Steve Henson]



  *) Support use of registered digest and cipher names for dgst and cipher

     commands instead of having to add each one as a special case. So now

     you can do:

NEWS

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
      o ecdsa-with-SHA224/256/384/512 signature types.

      o dsa-with-SHA224 and dsa-with-SHA256 signature types.

      o Opaque PRF Input TLS extension support.

      o Updated time routines to avoid OS limitations.



  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k:

STATUS

+2 −2
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2009/03/30 11:33:03 $

  ______________                           $Date: 2009/04/03 11:45:14 $



  DEVELOPMENT STATE



    o  OpenSSL 1.0:  Under development...

    o  OpenSSL 1.0.0-beta1: Released on April 1st, 2009

    o  OpenSSL 0.9.8h: Released on May       28th, 2008

    o  OpenSSL 0.9.8g: Released on October   19th, 2007

    o  OpenSSL 0.9.8f: Released on October   11th, 2007

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ $multilib = 


*** debug-ben-debug

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$cflags       = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -DBN_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -g3 -O2 -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       =

apps/ocsp.c

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
				   on OpenVMS */

#endif



#define USE_SOCKETS



#include <stdio.h>

#include <stdlib.h>

#include <string.h>