Add DSA_meth_{dup,free,new,set_{finish,sign}}()

As in RSA_meth_*, note that these functions return NULL in
out-of-memory situations, but they do not set an error explicitly.

ok jsing

4 files changed, 93 insertions, 2 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 18c7c0608a..4817a4c260 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2018/03/17 15:12:56 tb Exp $
+# $OpenBSD: Makefile,v 1.26 2018/03/17 15:19:12 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -117,6 +117,7 @@ SRCS+= dh_ameth.c dh_pmeth.c dh_prn.c
 # dsa/
 SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c
 SRCS+= dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c
+SRCS+= dsa_meth.c
 
 # dso/
 SRCS+= dso_dlfcn.c dso_err.c dso_lib.c dso_null.c
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 7cb78c4daf..6777e8cc13 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -831,6 +831,11 @@ DSA_get0_pqg
 DSA_get_default_method
 DSA_get_ex_data
 DSA_get_ex_new_index
+DSA_meth_dup
+DSA_meth_free
+DSA_meth_new
+DSA_meth_set_finish
+DSA_meth_set_sign
 DSA_new
 DSA_new_method
 DSA_print
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index 8fe7c668b2..61bfc2b466 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.h,v 1.29 2018/02/20 17:52:27 tb Exp $ */
+/* $OpenBSD: dsa.h,v 1.30 2018/03/17 15:19:12 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -269,6 +269,13 @@ int DSA_test_flags(const DSA *d, int flags);
 void DSA_set_flags(DSA *d, int flags);
 ENGINE *DSA_get0_engine(DSA *d);
 
+DSA_METHOD *DSA_meth_new(const char *name, int flags);
+void DSA_meth_free(DSA_METHOD *meth);
+DSA_METHOD *DSA_meth_dup(const DSA_METHOD *meth);
+int DSA_meth_set_sign(DSA_METHOD *meth,
+    DSA_SIG *(*sign)(const unsigned char *, int, DSA *));
+int DSA_meth_set_finish(DSA_METHOD *meth, int (*finish)(DSA *));
+
 #define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
                                 EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
diff --git a/src/lib/libcrypto/dsa/dsa_meth.c b/src/lib/libcrypto/dsa/dsa_meth.c
new file mode 100644
index 0000000000..e6f043f830
--- /dev/null
+++ b/src/lib/libcrypto/dsa/dsa_meth.c
@@ -0,0 +1,78 @@
+/*      $OpenBSD: dsa_meth.c,v 1.1 2018/03/17 15:19:12 tb Exp $ */
+/*
+ * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <openssl/dsa.h>
+#include <openssl/err.h>
+
+DSA_METHOD *
+DSA_meth_new(const char *name, int flags)
+{
+        DSA_METHOD *meth;
+
+        if ((meth = calloc(1, sizeof(*meth))) == NULL)
+                return NULL;
+        if ((meth->name = strdup(name)) == NULL) {
+                free(meth);
+                return NULL;
+        }
+        meth->flags = flags;
+
+        return meth;
+}
+
+void
+DSA_meth_free(DSA_METHOD *meth)
+{
+        if (meth != NULL) {
+                free((char *)meth->name);
+                free(meth);
+        }
+}
+
+DSA_METHOD *
+DSA_meth_dup(const DSA_METHOD *meth)
+{
+        DSA_METHOD *copy;
+
+        if ((copy = calloc(1, sizeof(*copy))) == NULL)
+                return NULL;
+        memcpy(copy, meth, sizeof(*copy));
+        if ((copy->name = strdup(meth->name)) == NULL) {
+                free(copy);
+                return NULL;
+        }
+        
+        return copy;
+}
+
+int
+DSA_meth_set_sign(DSA_METHOD *meth,
+    DSA_SIG *(*sign)(const unsigned char *, int, DSA *))
+{
+        meth->dsa_do_sign = sign;
+        return 1;
+}
+
+int
+DSA_meth_set_finish(DSA_METHOD *meth, int (*finish)(DSA *))
+{
+        meth->finish = finish;
+        return 1;
+}