Prepare to provide PKCS12 accessors

In order to be able to make pkcs12/ opaque, we need an entire family of
accessors. These are in a particularly nasty tangle since this was done
in about a dozen steps while sprinkling const, renaming functions, etc.
The public API also adds backward compat macros for functions that were
in the tree for half a day and then renamed. Of course some of them got
picked up by some ports.

Some of the gruesome hacks in here will go away with the next bump, but
that doesn't mean that the pkcs12 directory will be prettier afterward.

ok jsing

1 files changed, 34 insertions, 1 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index 7474bf5ff3..5c9cea90db 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_mutl.c,v 1.30 2022/07/25 05:06:06 tb Exp $ */
+/* $OpenBSD: p12_mutl.c,v 1.31 2022/08/03 20:16:06 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -72,6 +72,39 @@
 #include "hmac_local.h"
 #include "x509_lcl.h"
 
+int
+PKCS12_mac_present(const PKCS12 *p12)
+{
+        return p12->mac != NULL;
+}
+
+void
+PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac, const X509_ALGOR **pmacalg,
+    const ASN1_OCTET_STRING **psalt, const ASN1_INTEGER **piter,
+    const PKCS12 *p12)
+{
+        if (p12->mac == NULL) {
+                if (pmac != NULL)
+                        *pmac = NULL;
+                if (pmacalg != NULL)
+                        *pmacalg = NULL;
+                if (psalt != NULL)
+                        *psalt = NULL;
+                if (piter != NULL)
+                        *piter = NULL;
+                return;
+        }
+
+        if (pmac != NULL)
+                *pmac = p12->mac->dinfo->digest;
+        if (pmacalg != NULL)
+                *pmacalg = p12->mac->dinfo->algor;
+        if (psalt != NULL)
+                *psalt = p12->mac->salt;
+        if (piter != NULL)
+                *piter = p12->mac->iter;
+}
+
 /* Generate a MAC */
 int
 PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,