Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 605026 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (+3 lines)
Lines 1123-1128 else Link Here
1123 
			if test "$cf_result" != yes; then
 1123 
			if test "$cf_result" != yes; then
1124 
				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
 1124 
				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
1125 
			fi
 1125 
			fi
1126 
			if test "$cf_result" != yes; then
1127 
				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OPENSSL_init_ssl(0, NULL)]])],[cf_result=yes],[cf_result=no])
1128 
			fi
1126 
		fi
 1129 
		fi
1127 
	done
 1130 
	done
1128 

          1131
          

        



(-)a/src/network/ssl/socket.c
      (+4 lines)




  

    
      
            Lines 247-253
          static int
      
      
        Link Here
      
    
  

        

          247
          
match_uri_host_ip(const unsigned char *uri_host,

          247
          
match_uri_host_ip(const unsigned char *uri_host,

        

        

          248
          
		  ASN1_OCTET_STRING *cert_host_asn1)

          248
          
		  ASN1_OCTET_STRING *cert_host_asn1)

        

        

          249
          
{

          249
          
{

        

            

              
              
              250
              
#if OPENSSL_VERSION_NUMBER < 0x10100000L

            

        

          250
          
	const unsigned char *cert_host_addr = ASN1_STRING_data(cert_host_asn1);

          251
          
	const unsigned char *cert_host_addr = ASN1_STRING_data(cert_host_asn1);

        

            

              
              
              252
              
#else

            

            

              253
              
	const unsigned char *cert_host_addr = ASN1_STRING_get0_data(cert_host_asn1);

            

            

              254
              
#endif

            

        

          251
          
	struct in_addr uri_host_in;

          255
          
	struct in_addr uri_host_in;

        

        

          252
          
#ifdef CONFIG_IPV6

          256
          
#ifdef CONFIG_IPV6

        

        

          253
          
	struct in6_addr uri_host_in6;

          257
          
	struct in6_addr uri_host_in6;

        



(-)a/src/network/ssl/ssl.c
      (+6 lines)




  

    
      
            Lines 95-101
          init_openssl(struct module *module)
      
      
        Link Here
      
    
  

        

          95
          
	}

          95
          
	}

        

        

          96
          
#endif

          96
          
#endif

        

        

          97
          

          97
          

        

            

              
              
              98
              
#if OPENSSL_VERSION_NUMBER < 0x10100000L

            

        

          98
          
	SSLeay_add_ssl_algorithms();

          99
          
	SSLeay_add_ssl_algorithms();

        

            

              
              
              100
              
#endif

            

        

          99
          
	context = SSL_CTX_new(SSLv23_client_method());

          101
          
	context = SSL_CTX_new(SSLv23_client_method());

        

        

          100
          
	SSL_CTX_set_options(context, SSL_OP_ALL);

          102
          
	SSL_CTX_set_options(context, SSL_OP_ALL);

        

        

          101
          
	SSL_CTX_set_default_verify_paths(context);

          103
          
	SSL_CTX_set_default_verify_paths(context);

        

  

    
      
            Lines 471-477
          void
      
      
        Link Here
      
    
  

        

          471
          
random_nonce(unsigned char buf[], size_t size)

          473
          
random_nonce(unsigned char buf[], size_t size)

        

        

          472
          
{

          474
          
{

        

        

          473
          
#ifdef USE_OPENSSL

          475
          
#ifdef USE_OPENSSL

        

            

              
              
              476
              
#if OPENSSL_VERSION_NUMBER < 0x10100000L

            

        

          474
          
	RAND_pseudo_bytes(buf, size);

          477
          
	RAND_pseudo_bytes(buf, size);

        

            

              
              
              478
              
#else

            

            

              479
              
	RAND_bytes(buf, size);

            

            

              480
              
#endif

            

        

          475
          
#elif defined(CONFIG_GNUTLS)

          481
          
#elif defined(CONFIG_GNUTLS)

        

        

          476
          
	gcry_create_nonce(buf, size);

          482
          
	gcry_create_nonce(buf, size);

        

        

          477
          
#else

          483
          
#else

        






  

  Return to bug 605026