From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cgSZn-0000re-B0 for barebox@lists.infradead.org; Wed, 22 Feb 2017 08:47:09 +0000 Date: Wed, 22 Feb 2017 09:46:43 +0100 From: Sascha Hauer Message-ID: <20170222084643.pbxtgbnfbepeabkn@pengutronix.de> References: <1485872952-8386-1-git-send-email-s.hauer@pengutronix.de> <1487598249.2268.9.camel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1487598249.2268.9.camel@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] scripts: mxsimage: Fix build with OpenSSL < 1.1.x To: Lucas Stach Cc: Barebox List , ukl@pengutronix.de On Mon, Feb 20, 2017 at 02:44:09PM +0100, Lucas Stach wrote: > Am Dienstag, den 31.01.2017, 15:29 +0100 schrieb Sascha Hauer: > > Move the compatibility wrapper functions up so that they > > are defined before they are used. > > > > Signed-off-by: Sascha Hauer > > Tested-by: Lucas Stach > > This fixes the build failures seen in the randcfg builder. Can you > please commit this? Already did that. Sascha > > > --- > > scripts/mxsimage.c | 62 +++++++++++++++++++++++++++--------------------------- > > 1 file changed, 31 insertions(+), 31 deletions(-) > > > > diff --git a/scripts/mxsimage.c b/scripts/mxsimage.c > > index bcbbf00..5c2c307 100644 > > --- a/scripts/mxsimage.c > > +++ b/scripts/mxsimage.c > > @@ -410,6 +410,37 @@ static void make_crc_table(void) > > crc_table_valid = 1; > > } > > > > +/* > > + * OpenSSL 1.1.0 and newer compatibility functions: > > + * https://wiki.openssl.org/index.php/1.1_API_Changes > > + */ > > +#if OPENSSL_VERSION_NUMBER < 0x10100000L > > +static void *OPENSSL_zalloc(size_t num) > > +{ > > + void *ret = OPENSSL_malloc(num); > > + > > + if (ret != NULL) > > + memset(ret, 0, num); > > + return ret; > > +} > > + > > +EVP_MD_CTX *EVP_MD_CTX_new(void) > > +{ > > + return OPENSSL_zalloc(sizeof(EVP_MD_CTX)); > > +} > > + > > +void EVP_MD_CTX_free(EVP_MD_CTX *ctx) > > +{ > > + EVP_MD_CTX_cleanup(ctx); > > + OPENSSL_free(ctx); > > +} > > + > > +int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) > > +{ > > + return EVP_CIPHER_CTX_cleanup(ctx); > > +} > > +#endif > > + > > uint32_t pbl_crc32(uint32_t in_crc, const char *buf, uint32_t len) > > { > > uint32_t crc32_val; > > @@ -2292,37 +2323,6 @@ static int sb_verify_image_end(struct sb_image_ctx *ictx, > > return ret; > > } > > > > -/* > > - * OpenSSL 1.1.0 and newer compatibility functions: > > - * https://wiki.openssl.org/index.php/1.1_API_Changes > > - */ > > -#if OPENSSL_VERSION_NUMBER < 0x10100000L > > -static void *OPENSSL_zalloc(size_t num) > > -{ > > - void *ret = OPENSSL_malloc(num); > > - > > - if (ret != NULL) > > - memset(ret, 0, num); > > - return ret; > > -} > > - > > -EVP_MD_CTX *EVP_MD_CTX_new(void) > > -{ > > - return OPENSSL_zalloc(sizeof(EVP_MD_CTX)); > > -} > > - > > -void EVP_MD_CTX_free(EVP_MD_CTX *ctx) > > -{ > > - EVP_MD_CTX_cleanup(ctx); > > - OPENSSL_free(ctx); > > -} > > - > > -int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) > > -{ > > - return EVP_CIPHER_CTX_cleanup(ctx); > > -} > > -#endif > > - > > static int sb_build_tree_from_img(struct sb_image_ctx *ictx) > > { > > long filesize; > > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox