OpenSSL: OpenSSL_0_9_7-stable: openssl/crypto/conf/ conf.h conf_...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
09-Apr-2007 13:47:18
  Branch: OpenSSL_0_9_7-stable             Handle:
2007040912471601

  Modified files:           (Branch: OpenSSL_0_9_7-stable)
    openssl/crypto/conf     conf.h conf_mod.c conf_sap.c

  Log:
    Update from HEAD.

  Summary:
    Revision    Changes     Path
    1.30.2.5    +1  -0      openssl/crypto/conf/conf.h
    1.8.2.10    +5  -4      openssl/crypto/conf/conf_mod.c
    1.1.2.3     +1  -1      openssl/crypto/conf/conf_sap.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/conf/conf.h
 
============================================================
================
  $ cvs diff -u -r1.30.2.4 -r1.30.2.5 conf.h
  --- openssl/crypto/conf/conf.h	13 Jun 2002 17:38:51
-0000	1.30.2.4
  +++ openssl/crypto/conf/conf.h	9 Apr 2007 11:47:16
-0000	1.30.2.5
   -113,6 +113,7 
   #define CONF_MFLAGS_SILENT		0x4
   #define CONF_MFLAGS_NO_DSO		0x8
   #define CONF_MFLAGS_IGNORE_MISSING_FILE	0x10
  +#define CONF_MFLAGS_DEFAULT_SECTION	0x20
   
   int CONF_set_default_method(CONF_METHOD *meth);
   void CONF_set_nconf(CONF *conf,LHASH *hash);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/conf/conf_mod.c
 
============================================================
================
  $ cvs diff -u -r1.8.2.9 -r1.8.2.10 conf_mod.c
  --- openssl/crypto/conf/conf_mod.c	27 Dec 2003 14:40:48
-0000	1.8.2.9
  +++ openssl/crypto/conf/conf_mod.c	9 Apr 2007 11:47:17
-0000	1.8.2.10
   -126,17 +126,18 
   	{
   	STACK_OF(CONF_VALUE) *values;
   	CONF_VALUE *vl;
  -	char *vsection;
  +	char *vsection = NULL;
   
   	int ret, i;
   
   	if (!cnf)
   		return 1;
   
  -	if (appname == NULL)
  -		appname = "openssl_conf";
  +	if (appname)
  +		vsection = NCONF_get_string(cnf, NULL, appname);
   
  -	vsection = NCONF_get_string(cnf, NULL, appname); 
  +	if (!appname || (!vsection && (flags &
CONF_MFLAGS_DEFAULT_SECTION)))
  +		vsection = NCONF_get_string(cnf, NULL,
"openssl_conf");
   
   	if (!vsection)
   		{
   .
  patch -p0 <<' .'
  Index: openssl/crypto/conf/conf_sap.c
 
============================================================
================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 conf_sap.c
  --- openssl/crypto/conf/conf_sap.c	30 Jan 2003 17:37:39
-0000	1.1.2.2
  +++ openssl/crypto/conf/conf_sap.c	9 Apr 2007 11:47:17
-0000	1.1.2.3
   -89,7 +89,7 
   
   	ERR_clear_error();
   	if (CONF_modules_load_file(NULL, NULL,
  -					CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
 
+	CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FIL
E) <= 0)
   		{
   		BIO *bio_err;
   		ERR_load_crypto_strings();
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org