Skip to content

V
vlc-2-2
Commit 04e57be4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib/gnutls: remove debug from patch

parent c2b86649
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
contrib/src/gnutls/mac-keychain-lookup.patch
View file @ 04e57be4
diff -ru gnutls-plain/lib/Makefile.am gnutls/lib/Makefile.am diff -ru gnutls-old/lib/Makefile.am gnutls/lib/Makefile.am
--- gnutls-plain/lib/Makefile.am 2013-06-02 19:33:57.000000000 +0200 --- gnutls-old/lib/Makefile.am 2013-06-02 19:33:57.000000000 +0200
+++ gnutls/lib/Makefile.am 2013-11-10 13:04:36.000000000 +0100 +++ gnutls/lib/Makefile.am 2013-11-10 13:28:18.000000000 +0100
@@ -152,6 +152,10 @@ @@ -152,6 +152,10 @@
DISTCLEANFILES += $(defexec_DATA) DISTCLEANFILES += $(defexec_DATA)
endif endif
+if MACOSX +if MACOSX
+libgnutls_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation +libgnutls_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation
+endif +endif
+ +
if WINDOWS if WINDOWS
thirdparty_libadd += -lcrypt32 thirdparty_libadd += -lcrypt32
endif endif
diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c diff -ru gnutls-old/lib/system.c gnutls/lib/system.c
--- gnutls-plain/lib/system.c 2013-04-10 22:25:51.000000000 +0200 --- gnutls-old/lib/system.c 2013-04-10 22:25:51.000000000 +0200
+++ gnutls/lib/system.c 2013-11-10 13:01:47.000000000 +0100 +++ gnutls/lib/system.c 2013-11-10 13:30:31.000000000 +0100
@@ -57,6 +57,15 @@ @@ -57,6 +57,15 @@
#undef send #undef send
#undef select #undef select
...@@ -31,7 +31,7 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c ...@@ -31,7 +31,7 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
/* System specific function wrappers. /* System specific function wrappers.
*/ */
@@ -550,6 +559,46 @@ @@ -550,6 +559,40 @@
return r; return r;
} }
...@@ -42,15 +42,11 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c ...@@ -42,15 +42,11 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
+{ +{
+ CFArrayRef anchors; + CFArrayRef anchors;
+ int ret = 0; + int ret = 0;
+ printf("add_system_trust\n"); + if (SecTrustCopyAnchorCertificates(&anchors) != 0)
+ if (SecTrustCopyAnchorCertificates(&anchors) != 0) {
+ printf("failure one\n");
+ return -1; + return -1;
+ }
+ +
+ CFIndex count = CFArrayGetCount(anchors); + CFIndex count = CFArrayGetCount(anchors);
+ for (int i = 0; i < count; i++) { + for (int i = 0; i < count; i++) {
+ printf("looping %i\n", i);
+ SecCertificateRef certref = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i); + SecCertificateRef certref = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
+ +
+ CSSM_DATA certData; + CSSM_DATA certData;
...@@ -67,8 +63,6 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c ...@@ -67,8 +63,6 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
+ } + }
+ CFRelease(anchors); + CFRelease(anchors);
+ +
+ printf("will return %i\n", ret);
+
+ return ret; + return ret;
+} +}
+ +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment