-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
73cd8c1
commit bd68a14
Showing
8 changed files
with
110 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| --- a/Configurations/unix-Makefile.tmpl | ||
| +++ b/Configurations/unix-Makefile.tmpl | ||
| @@ -974,8 +974,8 @@ | ||
| echo 'Name: OpenSSL-libcrypto'; \ | ||
| echo 'Description: OpenSSL cryptography library'; \ | ||
| echo 'Version: '$(VERSION); \ | ||
| - echo 'Libs: -L$${libdir} -lcrypto'; \ | ||
| - echo 'Libs.private: $(LIB_EX_LIBS)'; \ | ||
| + echo 'Libs: -L$${libdir} -lcrypto $(LIB_EX_LIBS)'; \ | ||
| + echo 'Libs.private:'; \ | ||
| echo 'Cflags: -I$${includedir}' ) > libcrypto.pc | ||
|
|
||
| libssl.pc: | ||
| --- i/exporters/pkg-config/libcrypto.pc.in | ||
| +++ w/exporters/pkg-config/libcrypto.pc.in | ||
| @@ -17,8 +17,8 @@ | ||
| Name: OpenSSL-libcrypto | ||
| Description: OpenSSL cryptography library | ||
| Version: {- $OpenSSL::safe::installdata::VERSION -} | ||
| -Libs: -L${libdir} -lcrypto | ||
| -Libs.private: {- join(' ', @OpenSSL::safe::installdata::LDLIBS) -} | ||
| +Libs: -L${libdir} -lcrypto {- join(' ', @OpenSSL::safe::installdata::LDLIBS) -} | ||
| +Libs.private: | ||
| Cflags:{- $OUT = ' -I${includedir}'; | ||
| if (scalar @OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX > 1) { | ||
| $OUT = ''; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 0 additions & 21 deletions
21
thirdparty/openssl/openssl-1.1.0j-parallel_install_fix.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- i/deps/turbo_ffi_wrap.c | ||
| +++ w/deps/turbo_ffi_wrap.c | ||
| @@ -58,7 +58,7 @@ | ||
| int common_name_loc = -1; | ||
| X509_NAME_ENTRY *common_name_entry = 0; | ||
| ASN1_STRING *common_name_asn1 = 0; | ||
| - char *common_name_str = 0; | ||
| + const char *common_name_str = 0; | ||
|
|
||
| common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name( | ||
| (X509 *) server_cert), | ||
| @@ -77,7 +77,7 @@ | ||
| if (!common_name_asn1) { | ||
| return Error; | ||
| } | ||
| - common_name_str = (char *) ASN1_STRING_data(common_name_asn1); | ||
| + common_name_str = (const char *) ASN1_STRING_get0_data(common_name_asn1); | ||
| if (ASN1_STRING_length(common_name_asn1) != strlen(common_name_str)) { | ||
| return MalformedCertificate; | ||
| } | ||
| @@ -113,7 +113,7 @@ | ||
| for (i=0; i<san_names_nb; i++){ | ||
| const GENERAL_NAME *current_name = sk_GENERAL_NAME_value(san_names, i); | ||
| if (current_name->type == GEN_DNS){ | ||
| - char *dns_name = (char *)ASN1_STRING_data(current_name->d.dNSName); | ||
| + const char *dns_name = (const char *)ASN1_STRING_get0_data(current_name->d.dNSName); | ||
| dns_name_sz = strlen(dns_name); | ||
| if (ASN1_STRING_length(current_name->d.dNSName) != dns_name_sz){ | ||
| result = MalformedCertificate; |