OpenSSL: openssl/demos/tunala/ autoungunk.sh cb.c tunala.c

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

  Server: cvs.openssl.org                  Name:   Geoff
Thorpe
  Root:   /v/openssl/cvs                   Email:  geoffopenssl.org
  Module: openssl                          Date:  
28-Mar-2008 02:56:09
  Branch: HEAD                             Handle:
2008032801560800

  Modified files:
    openssl/demos/tunala    autoungunk.sh cb.c tunala.c

  Log:
    Update tunala so it builds ok with
OPENSSL_NO_DEPRECATED, and improve the
    autoungunk.sh logic (autobits have grown since I last
tried this...).

  Summary:
    Revision    Changes     Path
    1.3         +2  -1     
openssl/demos/tunala/autoungunk.sh
    1.8         +21 -2      openssl/demos/tunala/cb.c
    1.19        +5  -3      openssl/demos/tunala/tunala.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/demos/tunala/autoungunk.sh
 
============================================================
================
  $ cvs diff -u -r1.2 -r1.3 autoungunk.sh
  --- openssl/demos/tunala/autoungunk.sh	20 Feb 2002
05:09:22 -0000	1.2
  +++ openssl/demos/tunala/autoungunk.sh	28 Mar 2008
01:56:08 -0000	1.3
   -15,4 +15,5 
   
   rm -f aclocal.m4 config.* configure install-sh 
   	missing mkinstalldirs stamp-h.* Makefile.in 
  -	ltconfig ltmain.sh
  +	ltconfig ltmain.sh depcomp
  +rm -rf autom4te.cache
   .
  patch -p0 <<' .'
  Index: openssl/demos/tunala/cb.c
 
============================================================
================
  $ cvs diff -u -r1.7 -r1.8 cb.c
  --- openssl/demos/tunala/cb.c	20 Feb 2002 05:02:46
-0000	1.7
  +++ openssl/demos/tunala/cb.c	28 Mar 2008 01:56:08
-0000	1.8
   -134,8 +134,27 
   	/* TODO: Perhaps make it so our global key can be
generated on-the-fly
   	 * after certain intervals? */
   	static RSA *rsa_tmp = NULL;
  -	if(!rsa_tmp)
  -		rsa_tmp = RSA_generate_key(keylength, RSA_F4, NULL,
NULL);
  +	BIGNUM *bn = NULL;
  +	int ok = 1;
  +	if(!rsa_tmp) {
  +		ok = 0;
  +		if(!(bn = BN_new()))
  +			goto end;
  +		if(!BN_set_word(bn, RSA_F4))
  +			goto end;
  +		if(!(rsa_tmp = RSA_new()))
  +			goto end;
  +		if(!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL))
  +			goto end;
  +		ok = 1;
  +	}
  +end:
  +	if(bn)
  +		BN_free(bn);
  +	if(!ok) {
  +		RSA_free(rsa_tmp);
  +		rsa_tmp = NULL;
  +	}
   	return rsa_tmp;
   }
   
   .
  patch -p0 <<' .'
  Index: openssl/demos/tunala/tunala.c
 
============================================================
================
  $ cvs diff -u -r1.18 -r1.19 tunala.c
  --- openssl/demos/tunala/tunala.c	20 Feb 2002 05:02:46
-0000	1.18
  +++ openssl/demos/tunala/tunala.c	28 Mar 2008 01:56:08
-0000	1.19
   -697,9 +697,11 
   			abort();
   		fprintf(stderr, "Info, generating DH parameters
... ");
   		fflush(stderr);
  -		if((dh = DH_generate_parameters(512, DH_GENERATOR_5,
  -					NULL, NULL)) == NULL) {
  +		if(!(dh = DH_new()) || !DH_generate_parameters_ex(dh,
512,
  +					DH_GENERATOR_5, NULL)) {
   			fprintf(stderr, "error!n");
  +			if(dh)
  +				DH_free(dh);
   			return 0;
   		}
   		fprintf(stderr, "completen");
   -733,7 +735,7 
   		unsigned int verify_depth)
   {
   	SSL_CTX *ctx = NULL, *ret = NULL;
  -	SSL_METHOD *meth;
  +	const SSL_METHOD *meth;
   	ENGINE *e = NULL;
   
           OpenSSL_add_ssl_algorithms();
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org