OpenSSL: OpenSSL_0_9_8-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:46:37
  Branch: OpenSSL_0_9_8-stable             Handle:
2007040912463600

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

  Log:
    Update from HEAD.

  Summary:
    Revision    Changes     Path
    1.36.2.1    +1  -0      openssl/crypto/conf/conf.h
    1.17.2.1    +5  -4      openssl/crypto/conf/conf_mod.c
    1.2.2.1     +2  -2      openssl/crypto/conf/conf_sap.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/conf/conf.h
 
============================================================
================
  $ cvs diff -u -r1.36 -r1.36.2.1 conf.h
  --- openssl/crypto/conf/conf.h	11 May 2005 03:45:25
-0000	1.36
  +++ openssl/crypto/conf/conf.h	9 Apr 2007 11:46:36
-0000	1.36.2.1
   -114,6 +114,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.17 -r1.17.2.1 conf_mod.c
  --- openssl/crypto/conf/conf_mod.c	11 May 2005 03:45:25
-0000	1.17
  +++ openssl/crypto/conf/conf_mod.c	9 Apr 2007 11:46:36
-0000	1.17.2.1
   -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.2 -r1.2.2.1 conf_sap.c
  --- openssl/crypto/conf/conf_sap.c	30 Jan 2003 17:39:17
-0000	1.2
  +++ openssl/crypto/conf/conf_sap.c	9 Apr 2007 11:46:36
-0000	1.2.2.1
   -88,8 +88,8 
   
   
   	ERR_clear_error();
  -	if (CONF_modules_load_file(NULL, NULL,
  -					CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
  +	if (CONF_modules_load_file(NULL, config_name,
 
+	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