Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
04e57be4
Commit
04e57be4
authored
Nov 10, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib/gnutls: remove debug from patch
parent
c2b86649
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
15 deletions
+9
-15
contrib/src/gnutls/mac-keychain-lookup.patch
contrib/src/gnutls/mac-keychain-lookup.patch
+9
-15
No files found.
contrib/src/gnutls/mac-keychain-lookup.patch
View file @
04e57be4
diff -ru gnutls-
plain
/lib/Makefile.am gnutls/lib/Makefile.am
--- gnutls-
plain
/lib/Makefile.am 2013-06-02 19:33:57.000000000 +0200
+++ gnutls/lib/Makefile.am 2013-11-10 13:
04:36
.000000000 +0100
diff -ru gnutls-
old
/lib/Makefile.am gnutls/lib/Makefile.am
--- gnutls-
old
/lib/Makefile.am 2013-06-02 19:33:57.000000000 +0200
+++ gnutls/lib/Makefile.am 2013-11-10 13:
28:18
.000000000 +0100
@@ -152,6 +152,10 @@
DISTCLEANFILES += $(defexec_DATA)
endif
+if MACOSX
+libgnutls_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation
+libgnutls_la_LDFLAGS +=
-Wl,-framework,Security,-framework,CoreFoundation
+endif
+
if WINDOWS
thirdparty_libadd += -lcrypt32
endif
diff -ru gnutls-
plain
/lib/system.c gnutls/lib/system.c
--- gnutls-
plain
/lib/system.c 2013-04-10 22:25:51.000000000 +0200
+++ gnutls/lib/system.c 2013-11-10 13:
01:47
.000000000 +0100
diff -ru gnutls-
old
/lib/system.c gnutls/lib/system.c
--- gnutls-
old
/lib/system.c 2013-04-10 22:25:51.000000000 +0200
+++ gnutls/lib/system.c 2013-11-10 13:
30:31
.000000000 +0100
@@ -57,6 +57,15 @@
#undef send
#undef select
...
...
@@ -31,7 +31,7 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
/* System specific function wrappers.
*/
@@ -550,6 +559,4
6
@@
@@ -550,6 +559,4
0
@@
return r;
}
...
...
@@ -42,15 +42,11 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
+{
+ CFArrayRef anchors;
+ int ret = 0;
+ printf("add_system_trust\n");
+ if (SecTrustCopyAnchorCertificates(&anchors) != 0) {
+ printf("failure one\n");
+ if (SecTrustCopyAnchorCertificates(&anchors) != 0)
+ return -1;
+ }
+
+ CFIndex count = CFArrayGetCount(anchors);
+ for (int i = 0; i < count; i++) {
+ printf("looping %i\n", i);
+ SecCertificateRef certref = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
+
+ CSSM_DATA certData;
...
...
@@ -67,8 +63,6 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
+ }
+ CFRelease(anchors);
+
+ printf("will return %i\n", ret);
+
+ return ret;
+}
+
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment