Commit d1914bf7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent and not so recent changes from 0.9.6-stable.

parent b2ffd608

crypto/evp/e_rc4.c

+1 −2
Original line number Diff line number Diff line
@@ -110,9 +110,8 @@ EVP_CIPHER *EVP_rc4_40(void) 
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

			const unsigned char *iv, int enc)

	{

	memcpy(&(ctx->c.rc4.key[0]),key,EVP_CIPHER_CTX_key_length(ctx));

	RC4_set_key(&(ctx->c.rc4.ks),EVP_CIPHER_CTX_key_length(ctx),

		ctx->c.rc4.key);

		    key);

	return 1;

	}

crypto/mem.c

+3 −3
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line) 
	void *ret = NULL;

	extern unsigned char cleanse_ctr;



	if (num < 0) return NULL;

	if (num <= 0) return NULL;



	allow_customize = 0;

	if (malloc_debug_func != NULL)
@@ -216,7 +216,7 @@ void *CRYPTO_malloc(int num, const char *file, int line) 
	void *ret = NULL;

	extern unsigned char cleanse_ctr;



	if (num < 0) return NULL;

	if (num <= 0) return NULL;



	allow_customize = 0;

	if (malloc_debug_func != NULL)
@@ -247,7 +247,7 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line) 
	if (str == NULL)

		return CRYPTO_malloc(num, file, line);



	if (num < 0) return NULL;

	if (num <= 0) return NULL;



	if (realloc_debug_func != NULL)

		realloc_debug_func(str, NULL, num, file, line, 0);

crypto/x509/x509type.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey) 
		break;

		}



	if (EVP_PKEY_size(pk) <= 512/8)	/* /8 because it's 512 bits we look

	if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look

					   for, not bytes */

		ret|=EVP_PKT_EXP;

	if(pkey==NULL) EVP_PKEY_free(pk);

doc/crypto/BIO_f_ssl.pod

+3 −3
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ a client and also echoes the request to standard output. 
	return 0;

 }



 BIO_puts(sbio, "HTTP/1.0 200 OK\r\nContent-type: text/html\r\n\r\n");

 BIO_puts(sbio, "<pre>\r\nConnection Established\r\nRequest headers:\r\n");

 BIO_puts(sbio, "HTTP/1.0 200 OK\r\nContent-type: text/plain\r\n\r\n");

 BIO_puts(sbio, "\r\nConnection Established\r\nRequest headers:\r\n");

 BIO_puts(sbio, "--------------------------------------------------\r\n");



 for(;;) {
@@ -301,7 +301,7 @@ a client and also echoes the request to standard output. 
 }



 BIO_puts(sbio, "--------------------------------------------------\r\n");

 BIO_puts(sbio, "</pre>\r\n");

 BIO_puts(sbio, "\r\n");



 /* Since there is a buffering BIO present we had better flush it */

 BIO_flush(sbio);

doc/ssl/SSL_COMP_add_compression_method.pod

+2 −2
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values: 


=over 4



=item 1

=item 0



The operation succeeded.



=item 0

=item 1



The operation failed. Check the error queue to find out the reason.