From 99a24ba0f14c1eb87b6ebc4c4de4dde5335534be Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Mon, 7 Mar 2016 16:11:01 -0800 Subject: [PATCH] Add DSA_generate_parameters to decrepit. This function was deprecated by OpenSSL in 0.9.8 but code that uses it still exists. This change adds an implementation of this function to decreipt/ to support these programs. Change-Id: Ie99cd00ff8b0ab2675f2b1c821c3d664b9811f16 Reviewed-on: https://boringssl-review.googlesource.com/7360 Reviewed-by: David Benjamin --- decrepit/CMakeLists.txt | 2 + decrepit/dsa/CMakeLists.txt | 9 ++++ decrepit/dsa/dsa_decrepit.c | 101 ++++++++++++++++++++++++++++++++++++ include/openssl/dsa.h | 9 ++++ 4 files changed, 121 insertions(+) create mode 100644 decrepit/dsa/CMakeLists.txt create mode 100644 decrepit/dsa/dsa_decrepit.c diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt index a7677d0a..d158def2 100644 --- a/decrepit/CMakeLists.txt +++ b/decrepit/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(bio) add_subdirectory(blowfish) add_subdirectory(cast) add_subdirectory(des) +add_subdirectory(dsa) add_subdirectory(evp) add_subdirectory(rsa) add_subdirectory(xts) @@ -13,6 +14,7 @@ add_library( $ $ $ + $ $ $ $ diff --git a/decrepit/dsa/CMakeLists.txt b/decrepit/dsa/CMakeLists.txt new file mode 100644 index 00000000..cc64b604 --- /dev/null +++ b/decrepit/dsa/CMakeLists.txt @@ -0,0 +1,9 @@ +include_directories(../../include) + +add_library( + dsa_decrepit + + OBJECT + + dsa_decrepit.c +) diff --git a/decrepit/dsa/dsa_decrepit.c b/decrepit/dsa/dsa_decrepit.c new file mode 100644 index 00000000..03128b51 --- /dev/null +++ b/decrepit/dsa/dsa_decrepit.c @@ -0,0 +1,101 @@ +/* ==================================================================== + * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. 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. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED 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 OpenSSL PROJECT OR + * ITS 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). */ + +#include +#include + + +struct wrapped_callback { + void (*callback)(int, int, void *); + void *arg; +}; + +/* callback_wrapper converts an “old” style generation callback to the newer + * |BN_GENCB| form. */ +static int callback_wrapper(int event, int n, BN_GENCB *gencb) { + struct wrapped_callback *wrapped = (struct wrapped_callback *) gencb->arg; + wrapped->callback(event, n, wrapped->arg); + return 1; +} + +DSA *DSA_generate_parameters(int bits, uint8_t *seed_in, int seed_len, + int *counter_ret, unsigned long *h_ret, + void (*callback)(int, int, void *), void *cb_arg) { + if (bits < 0 || seed_len < 0) { + return NULL; + } + + DSA *ret = DSA_new(); + if (ret == NULL) { + return NULL; + } + + BN_GENCB gencb_storage; + BN_GENCB *cb = NULL; + + struct wrapped_callback wrapped = {callback, cb_arg}; + if (callback != NULL) { + cb = &gencb_storage; + BN_GENCB_set(cb, callback_wrapper, &wrapped); + } + + if (!DSA_generate_parameters_ex(ret, bits, seed_in, seed_len, counter_ret, + h_ret, cb)) { + goto err; + } + + return ret; + +err: + DSA_free(ret); + return NULL; +} diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index 8cf008b6..0077a722 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -363,6 +363,15 @@ OPENSSL_EXPORT DSA *d2i_DSAparams(DSA **out, const uint8_t **inp, long len); * Use |DSA_marshal_parameters| instead. */ OPENSSL_EXPORT int i2d_DSAparams(const DSA *in, uint8_t **outp); +/* DSA_generate_parameters is a deprecated version of + * |DSA_generate_parameters_ex| that creates and returns a |DSA*|. Don't use + * it. */ +OPENSSL_EXPORT DSA *DSA_generate_parameters(int bits, unsigned char *seed, + int seed_len, int *counter_ret, + unsigned long *h_ret, + void (*callback)(int, int, void *), + void *cb_arg); + struct dsa_st { long version;