df995a003d
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libssh?expand=0&rev=d54088acd3a6df64c2b48b502a614e33
422 lines
10 KiB
Diff
422 lines
10 KiB
Diff
From b6cfde8987d201e3cee942d3368e18545d6c28fb Mon Sep 17 00:00:00 2001
|
|
From: Jakub Jelen <jjelen@redhat.com>
|
|
Date: Wed, 2 Nov 2016 16:38:09 +0100
|
|
Subject: [PATCH] libcrypto: Introduce a libcrypto compat file
|
|
|
|
This is for OpenSSL 1.1.0 support.
|
|
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
|
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
|
|
---
|
|
src/CMakeLists.txt | 1 +
|
|
src/libcrypto-compat.c | 335 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
src/libcrypto-compat.h | 42 +++++++
|
|
3 files changed, 378 insertions(+)
|
|
create mode 100644 src/libcrypto-compat.c
|
|
create mode 100644 src/libcrypto-compat.h
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index ab9f1843..3c22dfac 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -126,6 +126,7 @@ set(libssh_SRCS
|
|
known_hosts.c
|
|
legacy.c
|
|
libcrypto.c
|
|
+ libcrypto-compat.c
|
|
log.c
|
|
match.c
|
|
messages.c
|
|
diff --git a/src/libcrypto-compat.c b/src/libcrypto-compat.c
|
|
new file mode 100644
|
|
index 00000000..1f27dd5f
|
|
--- /dev/null
|
|
+++ b/src/libcrypto-compat.c
|
|
@@ -0,0 +1,335 @@
|
|
+/*
|
|
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
+ *
|
|
+ * Licensed under the OpenSSL license (the "License"). You may not use
|
|
+ * this file except in compliance with the License. You can obtain a copy
|
|
+ * in the file LICENSE in the source distribution or at
|
|
+ * https://www.openssl.org/source/license.html
|
|
+ */
|
|
+
|
|
+#include <openssl/opensslv.h>
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+
|
|
+#include <string.h>
|
|
+#include <openssl/engine.h>
|
|
+#include "libcrypto-compat.h"
|
|
+
|
|
+static void *OPENSSL_zalloc(size_t num)
|
|
+{
|
|
+ void *ret = OPENSSL_malloc(num);
|
|
+
|
|
+ if (ret != NULL)
|
|
+ memset(ret, 0, num);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
|
|
+{
|
|
+ /* If the fields n and e in r are NULL, the corresponding input
|
|
+ * parameters MUST be non-NULL for n and e. d may be
|
|
+ * left NULL (in case only the public key is used).
|
|
+ */
|
|
+ if ((r->n == NULL && n == NULL)
|
|
+ || (r->e == NULL && e == NULL))
|
|
+ return 0;
|
|
+
|
|
+ if (n != NULL) {
|
|
+ BN_free(r->n);
|
|
+ r->n = n;
|
|
+ }
|
|
+ if (e != NULL) {
|
|
+ BN_free(r->e);
|
|
+ r->e = e;
|
|
+ }
|
|
+ if (d != NULL) {
|
|
+ BN_free(r->d);
|
|
+ r->d = d;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
|
|
+{
|
|
+ /* If the fields p and q in r are NULL, the corresponding input
|
|
+ * parameters MUST be non-NULL.
|
|
+ */
|
|
+ if ((r->p == NULL && p == NULL)
|
|
+ || (r->q == NULL && q == NULL))
|
|
+ return 0;
|
|
+
|
|
+ if (p != NULL) {
|
|
+ BN_free(r->p);
|
|
+ r->p = p;
|
|
+ }
|
|
+ if (q != NULL) {
|
|
+ BN_free(r->q);
|
|
+ r->q = q;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
|
|
+{
|
|
+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
|
|
+ * parameters MUST be non-NULL.
|
|
+ */
|
|
+ if ((r->dmp1 == NULL && dmp1 == NULL)
|
|
+ || (r->dmq1 == NULL && dmq1 == NULL)
|
|
+ || (r->iqmp == NULL && iqmp == NULL))
|
|
+ return 0;
|
|
+
|
|
+ if (dmp1 != NULL) {
|
|
+ BN_free(r->dmp1);
|
|
+ r->dmp1 = dmp1;
|
|
+ }
|
|
+ if (dmq1 != NULL) {
|
|
+ BN_free(r->dmq1);
|
|
+ r->dmq1 = dmq1;
|
|
+ }
|
|
+ if (iqmp != NULL) {
|
|
+ BN_free(r->iqmp);
|
|
+ r->iqmp = iqmp;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void RSA_get0_key(const RSA *r,
|
|
+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
|
|
+{
|
|
+ if (n != NULL)
|
|
+ *n = r->n;
|
|
+ if (e != NULL)
|
|
+ *e = r->e;
|
|
+ if (d != NULL)
|
|
+ *d = r->d;
|
|
+}
|
|
+
|
|
+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
|
|
+{
|
|
+ if (p != NULL)
|
|
+ *p = r->p;
|
|
+ if (q != NULL)
|
|
+ *q = r->q;
|
|
+}
|
|
+
|
|
+void RSA_get0_crt_params(const RSA *r,
|
|
+ const BIGNUM **dmp1, const BIGNUM **dmq1,
|
|
+ const BIGNUM **iqmp)
|
|
+{
|
|
+ if (dmp1 != NULL)
|
|
+ *dmp1 = r->dmp1;
|
|
+ if (dmq1 != NULL)
|
|
+ *dmq1 = r->dmq1;
|
|
+ if (iqmp != NULL)
|
|
+ *iqmp = r->iqmp;
|
|
+}
|
|
+
|
|
+void DSA_get0_pqg(const DSA *d,
|
|
+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
|
|
+{
|
|
+ if (p != NULL)
|
|
+ *p = d->p;
|
|
+ if (q != NULL)
|
|
+ *q = d->q;
|
|
+ if (g != NULL)
|
|
+ *g = d->g;
|
|
+}
|
|
+
|
|
+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
|
|
+{
|
|
+ /* If the fields p, q and g in d are NULL, the corresponding input
|
|
+ * parameters MUST be non-NULL.
|
|
+ */
|
|
+ if ((d->p == NULL && p == NULL)
|
|
+ || (d->q == NULL && q == NULL)
|
|
+ || (d->g == NULL && g == NULL))
|
|
+ return 0;
|
|
+
|
|
+ if (p != NULL) {
|
|
+ BN_free(d->p);
|
|
+ d->p = p;
|
|
+ }
|
|
+ if (q != NULL) {
|
|
+ BN_free(d->q);
|
|
+ d->q = q;
|
|
+ }
|
|
+ if (g != NULL) {
|
|
+ BN_free(d->g);
|
|
+ d->g = g;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void DSA_get0_key(const DSA *d,
|
|
+ const BIGNUM **pub_key, const BIGNUM **priv_key)
|
|
+{
|
|
+ if (pub_key != NULL)
|
|
+ *pub_key = d->pub_key;
|
|
+ if (priv_key != NULL)
|
|
+ *priv_key = d->priv_key;
|
|
+}
|
|
+
|
|
+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
|
|
+{
|
|
+ /* If the field pub_key in d is NULL, the corresponding input
|
|
+ * parameters MUST be non-NULL. The priv_key field may
|
|
+ * be left NULL.
|
|
+ */
|
|
+ if (d->pub_key == NULL && pub_key == NULL)
|
|
+ return 0;
|
|
+
|
|
+ if (pub_key != NULL) {
|
|
+ BN_free(d->pub_key);
|
|
+ d->pub_key = pub_key;
|
|
+ }
|
|
+ if (priv_key != NULL) {
|
|
+ BN_free(d->priv_key);
|
|
+ d->priv_key = priv_key;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
|
|
+{
|
|
+ if (pr != NULL)
|
|
+ *pr = sig->r;
|
|
+ if (ps != NULL)
|
|
+ *ps = sig->s;
|
|
+}
|
|
+
|
|
+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
|
|
+{
|
|
+ if (r == NULL || s == NULL)
|
|
+ return 0;
|
|
+ BN_clear_free(sig->r);
|
|
+ BN_clear_free(sig->s);
|
|
+ sig->r = r;
|
|
+ sig->s = s;
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
|
|
+{
|
|
+ if (pr != NULL)
|
|
+ *pr = sig->r;
|
|
+ if (ps != NULL)
|
|
+ *ps = sig->s;
|
|
+}
|
|
+
|
|
+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
|
|
+{
|
|
+ if (r == NULL || s == NULL)
|
|
+ return 0;
|
|
+ BN_clear_free(sig->r);
|
|
+ BN_clear_free(sig->s);
|
|
+ sig->r = r;
|
|
+ sig->s = s;
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+EVP_MD_CTX *EVP_MD_CTX_new(void)
|
|
+{
|
|
+ return OPENSSL_zalloc(sizeof(EVP_MD_CTX));
|
|
+}
|
|
+
|
|
+static void OPENSSL_clear_free(void *str, size_t num)
|
|
+{
|
|
+ if (str == NULL)
|
|
+ return;
|
|
+ if (num)
|
|
+ OPENSSL_cleanse(str, num);
|
|
+ OPENSSL_free(str);
|
|
+}
|
|
+
|
|
+/* This call frees resources associated with the context */
|
|
+int EVP_MD_CTX_reset(EVP_MD_CTX *ctx)
|
|
+{
|
|
+ if (ctx == NULL)
|
|
+ return 1;
|
|
+
|
|
+ /*
|
|
+ * Don't assume ctx->md_data was cleaned in EVP_Digest_Final, because
|
|
+ * sometimes only copies of the context are ever finalised.
|
|
+ */
|
|
+ if (ctx->digest && ctx->digest->cleanup
|
|
+ && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED))
|
|
+ ctx->digest->cleanup(ctx);
|
|
+ if (ctx->digest && ctx->digest->ctx_size && ctx->md_data
|
|
+ && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)) {
|
|
+ OPENSSL_clear_free(ctx->md_data, ctx->digest->ctx_size);
|
|
+ }
|
|
+ EVP_PKEY_CTX_free(ctx->pctx);
|
|
+#ifndef OPENSSL_NO_ENGINE
|
|
+ ENGINE_finish(ctx->engine);
|
|
+#endif
|
|
+ OPENSSL_cleanse(ctx, sizeof(*ctx));
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
|
|
+{
|
|
+ EVP_MD_CTX_reset(ctx);
|
|
+ OPENSSL_free(ctx);
|
|
+}
|
|
+
|
|
+HMAC_CTX *HMAC_CTX_new(void)
|
|
+{
|
|
+ HMAC_CTX *ctx = OPENSSL_zalloc(sizeof(HMAC_CTX));
|
|
+
|
|
+ if (ctx != NULL) {
|
|
+ if (!HMAC_CTX_reset(ctx)) {
|
|
+ HMAC_CTX_free(ctx);
|
|
+ return NULL;
|
|
+ }
|
|
+ }
|
|
+ return ctx;
|
|
+}
|
|
+
|
|
+static void hmac_ctx_cleanup(HMAC_CTX *ctx)
|
|
+{
|
|
+ EVP_MD_CTX_reset(&ctx->i_ctx);
|
|
+ EVP_MD_CTX_reset(&ctx->o_ctx);
|
|
+ EVP_MD_CTX_reset(&ctx->md_ctx);
|
|
+ ctx->md = NULL;
|
|
+ ctx->key_length = 0;
|
|
+ OPENSSL_cleanse(ctx->key, sizeof(ctx->key));
|
|
+}
|
|
+
|
|
+void HMAC_CTX_free(HMAC_CTX *ctx)
|
|
+{
|
|
+ if (ctx != NULL) {
|
|
+ hmac_ctx_cleanup(ctx);
|
|
+ EVP_MD_CTX_free(&ctx->i_ctx);
|
|
+ EVP_MD_CTX_free(&ctx->o_ctx);
|
|
+ EVP_MD_CTX_free(&ctx->md_ctx);
|
|
+ OPENSSL_free(ctx);
|
|
+ }
|
|
+}
|
|
+
|
|
+int HMAC_CTX_reset(HMAC_CTX *ctx)
|
|
+{
|
|
+ HMAC_CTX_init(ctx);
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void)
|
|
+{
|
|
+ return OPENSSL_zalloc(sizeof(EVP_CIPHER_CTX));
|
|
+}
|
|
+
|
|
+void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
|
|
+{
|
|
+ /* EVP_CIPHER_CTX_reset(ctx); alias */
|
|
+ EVP_CIPHER_CTX_init(ctx);
|
|
+ OPENSSL_free(ctx);
|
|
+}
|
|
+
|
|
+#else
|
|
+typedef int iso_c_forbids_an_empty_source_file;
|
|
+#endif /* OPENSSL_VERSION_NUMBER */
|
|
diff --git a/src/libcrypto-compat.h b/src/libcrypto-compat.h
|
|
new file mode 100644
|
|
index 00000000..21542c65
|
|
--- /dev/null
|
|
+++ b/src/libcrypto-compat.h
|
|
@@ -0,0 +1,42 @@
|
|
+#ifndef LIBCRYPTO_COMPAT_H
|
|
+#define LIBCRYPTO_COMPAT_H
|
|
+
|
|
+#include <openssl/opensslv.h>
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+
|
|
+#include <openssl/rsa.h>
|
|
+#include <openssl/dsa.h>
|
|
+#include <openssl/ecdsa.h>
|
|
+#include <openssl/dh.h>
|
|
+#include <openssl/evp.h>
|
|
+#include <openssl/hmac.h>
|
|
+
|
|
+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
|
|
+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
|
|
+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
|
|
+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
|
|
+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
|
|
+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
|
|
+
|
|
+void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
|
|
+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g);
|
|
+void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key);
|
|
+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key);
|
|
+
|
|
+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
|
|
+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s);
|
|
+
|
|
+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
|
|
+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
|
|
+
|
|
+int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
|
|
+EVP_MD_CTX *EVP_MD_CTX_new(void);
|
|
+void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
|
|
+
|
|
+HMAC_CTX *HMAC_CTX_new(void);
|
|
+int HMAC_CTX_reset(HMAC_CTX *ctx);
|
|
+void HMAC_CTX_free(HMAC_CTX *ctx);
|
|
+
|
|
+#endif /* OPENSSL_VERSION_NUMBER */
|
|
+
|
|
+#endif /* LIBCRYPTO_COMPAT_H */
|
|
--
|
|
2.13.5
|
|
|