Add keychain crypto store

NEWS

@@ -194,6 +194,7 @@ Misc
  * Add Gnome libsecret-based crypto keystore
  * Add KDE Kwallet-based crypto keystore
  * Add a plaintext keystore
+ * Add Keychain based crypto keystore for iOS, Mac OS X and tvOS
 
 Removed modules
  * Atmo video filter

modules/MODULES_LIST

@@ -203,6 +203,7 @@ $Id$
  * kai: OS/2 audio output
  * karaoke: simple karaoke audio filter
  * kate: kate text bitstream decoder
+ * keychain: Keystore for iOS, Mac OS X and tvOS
  * kva: OS/2 video output
  * kwallet: store secrets via KDE Kwallet
  * libass: Subtitle renderers using libass

modules/keystore/Makefile.am

@@ -29,6 +29,14 @@ if HAVE_KWALLET
 keystore_LTLIBRARIES += libkwallet_plugin.la
 endif
 
+libkeychain_plugin_la_SOURCES = keystore/keychain.m
+libkeychain_plugin_la_OBJCFLAGS = $(AM_CFLAGS) -fobjc-arc
+libkeychain_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(keystoredir)' -Wl,-framework,Foundation -Wl,-framework,Security
+
+if HAVE_DARWIN
+keystore_LTLIBRARIES += libkeychain_plugin.la
+endif
+
 keystore_LTLIBRARIES += \
 	$(LTLIBsecret)
 

po/POTFILES.in

@@ -947,6 +947,7 @@ modules/hw/vdpau/chroma.c
 modules/hw/vdpau/deinterlace.c
 modules/hw/vdpau/display.c
 modules/hw/vdpau/sharpen.c
+modules/keystore/keychain.m
 modules/lua/demux.c
 modules/lua/intf.c
 modules/lua/libs/configuration.c

test/modules/keystore/test.c

@@ -51,7 +51,8 @@ static const struct
     /* Following keystores are tested only when asked explicitly by the tester
      * (with "-a" argv) */
     { "secret", false },
-    { "kwallet", false }
+    { "kwallet", false },
+    { "keychain", false }
 };
 
 static void