Attachment 176644 Details for Bug 213819 – Add compatibility with LibreSSL

[patch] Add compatibility with LibreSSL

patch-Crypto.h (text/plain), 1.22 KB, created by Igor Pavlov on 2016-11-05 00:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Pavlov

Created: 2016-11-05 00:00:05 UTC

Size: 1.22 KB

patch

obsolete

>--- Crypto.h.orig	2016-10-17 04:37:40 UTC
>+++ Crypto.h
>@@ -282,14 +282,24 @@ namespace crypto
> 
> // take care about openssl version
> #include <openssl/opensslv.h>
>-#if (OPENSSL_VERSION_NUMBER < 0x010100000) // 1.1.0
>+#if (OPENSSL_VERSION_NUMBER < 0x010100000) || defined(LIBRESSL_VERSION_NUMBER) // 1.1.0 or LibreSSL
> // define getters and setters introduced in 1.1.0
>-inline int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) { d->p = p; d->q = q; d->g = g; return 1; }
>-inline int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) { d->pub_key = pub_key; d->priv_key = priv_key; return 1; } 
>+
>+inline int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
>+	{ d->p = p; d->q = q; d->g = g; return 1; }
>+inline int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
>+	{ d->pub_key = pub_key; d->priv_key = priv_key; return 1; }
>+
>+inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key)
>+	{ *pub_key = d->pub_key; *priv_key = d->priv_key; }
>+inline int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
>+	{ sig->r = r; sig->s = s; return 1; }
>+inline void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
>+	{ *pr = sig->r; *ps = sig->s; }
> 
> #endif
> 
>-}		
>-}	
>+}
>+}
> 
> #endif

Actions: View | Diff

Attachments on bug 213819: 176200 | 176644