Attachment #490370 for bug #626506

View | Details | Raw Unified | Return to bug 626506
Collapse All | Expand All

Lines 388-394 BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path) Link Here

(-)a/libfreerdp/crypto/crypto.c (-1 / +1 lines)
388	if (cert_ctx == NULL)	388	if (cert_ctx == NULL)
389	goto end;	389	goto end;
390		390
391	#if OPENSSL_VERSION_NUMBER < 0x10100000L	391	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
392	OpenSSL_add_all_algorithms();	392	OpenSSL_add_all_algorithms();
393	#else	393	#else
394	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \	394	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \

Lines 255-261 static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO Link Here

(-)a/winpr/libwinpr/utils/ssl.c (-1 / +1 lines)
255	}	255	}
256	#endif	256	#endif
257	/* SSL_load_error_strings() is void */	257	/* SSL_load_error_strings() is void */
258	#if (OPENSSL_VERSION_NUMBER < 0x10100000L)	258	#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
259	SSL_load_error_strings();	259	SSL_load_error_strings();
260	/* SSL_library_init() always returns "1" */	260	/* SSL_library_init() always returns "1" */
261	SSL_library_init();	261	SSL_library_init();




				printf("Using default export password \"password\"\n");
			}

#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
			OpenSSL_add_all_algorithms();
			OpenSSL_add_all_ciphers();
			OpenSSL_add_all_digests();

		key_length = atoi(arg->Value);
	}

#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
#else
	{

	{
		ASN1_TIME* before;
		ASN1_TIME* after;
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
		before = X509_get_notBefore(context->x509);
		after = X509_get_notAfter(context->x509);
#else

Return to bug 626506

Lines 620-626 int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa Link Here

(-)a/winpr/tools/makecert/makecert.c (-3 / +3 lines)
620	printf("Using default export password \"password\"\n");	620	printf("Using default export password \"password\"\n");
621	}	621	}
622		622
623	#if OPENSSL_VERSION_NUMBER < 0x10100000L	623	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
624	OpenSSL_add_all_algorithms();	624	OpenSSL_add_all_algorithms();
625	OpenSSL_add_all_ciphers();	625	OpenSSL_add_all_ciphers();
626	OpenSSL_add_all_digests();	626	OpenSSL_add_all_digests();
Lines 1008-1014 int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) Link Here
1008	key_length = atoi(arg->Value);	1008	key_length = atoi(arg->Value);
1009	}	1009	}
1010		1010
1011	#if (OPENSSL_VERSION_NUMBER < 0x10100000L)	1011	#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
1012	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);	1012	context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL);
1013	#else	1013	#else
1014	{	1014	{
Lines 1043-1049 int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) Link Here
1043	{	1043	{
1044	ASN1_TIME* before;	1044	ASN1_TIME* before;
1045	ASN1_TIME* after;	1045	ASN1_TIME* after;
1046	#if (OPENSSL_VERSION_NUMBER < 0x10100000L)	1046	#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
1047	before = X509_get_notBefore(context->x509);	1047	before = X509_get_notBefore(context->x509);
1048	after = X509_get_notAfter(context->x509);	1048	after = X509_get_notAfter(context->x509);
1049	#else	1049	#else