trust: introduce the "edk2-cacerts" extractor skeleton

Introduce the p11_extract_edk2_cacerts() skeleton. At the moment it always
fails, silently.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559580
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/trust/Makefile.am b/trust/Makefile.am
index 6e52c4d4bc8aba00b974293e2eac5cfc4ce095b3..147675f1be06bcaa02fc20ae31688328be12de64 100644 (file)
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -105,6 +105,7 @@ trust_trust_SOURCES = \
        trust/enumerate.c trust/enumerate.h \
        trust/extract.c trust/extract.h \
        trust/extract-jks.c \
+       trust/extract-edk2.c \
        trust/extract-openssl.c \
        trust/extract-pem.c \
        trust/extract-cer.c \

diff --git a/trust/extract-edk2.c b/trust/extract-edk2.c
new file mode 100644 (file)
index 0000000..5bde060
--- /dev/null
+++ b/trust/extract-edk2.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018, Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Laszlo Ersek <lersek@redhat.com>
+ */
+
+#include "config.h"
+
+#include "extract.h" /* p11_extract_edk2_cacerts() */
+
+bool
+p11_extract_edk2_cacerts (p11_enumerate *ex,
+                          const char *destination)
+{
+       return false;
+}

diff --git a/trust/extract.c b/trust/extract.c
index 64c4ade0c1ce53b199cd968685619d7694857797..e656449e587a25ab23e1382e8827a05ca09d3c27 100644 (file)
--- a/trust/extract.c
+++ b/trust/extract.c
@@ -81,6 +81,7 @@ format_argument (const char *optarg,
                { "pem-directory", p11_extract_pem_directory },
                { "pem-directory-hash", p11_extract_pem_directory_hash },
                { "java-cacerts", p11_extract_jks_cacerts },
+               { "edk2-cacerts", p11_extract_edk2_cacerts },
                { "openssl-bundle", p11_extract_openssl_bundle },
                { "openssl-directory", p11_extract_openssl_directory },
                { NULL },
@@ -211,7 +212,8 @@ p11_trust_extract (int argc,
                  "  pem-directory-hash  directory of PEM files with hash links\n"
                  "  openssl-bundle      OpenSSL specific PEM bundle\n"
                  "  openssl-directory   directory of OpenSSL specific files\n"
-                 "  java-cacerts        java keystore cacerts file",
+                 "  java-cacerts        java keystore cacerts file\n"
+                 "  edk2-cacerts        cacerts file for EDK2 HTTPS config",
                  "type"
                },
                { opt_purpose,

diff --git a/trust/extract.h b/trust/extract.h
index 2664ba0e556dbf726fd2469b02a648b625e4e83a..9ce802a23fdb3d784a615f6f64d39bd527a95fa4 100644 (file)
--- a/trust/extract.h
+++ b/trust/extract.h
@@ -67,6 +67,9 @@ bool            p11_extract_pem_directory_hash (p11_enumerate *ex,
 bool            p11_extract_jks_cacerts        (p11_enumerate *ex,
                                                 const char *destination);
 
+bool            p11_extract_edk2_cacerts       (p11_enumerate *ex,
+                                                const char *destination);
+
 bool            p11_extract_openssl_bundle     (p11_enumerate *ex,
                                                 const char *destination);