summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-01-31 15:29:12 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-02 13:54:49 +0100
commite2805b5ee515baa5f3319811db9d839cca215707 (patch)
tree4cc4b3600f0b2772b6cf7a7c6482d989b8ca6f09
parentfaa369e9c55aa3b1f92bdb6a08d040af228ecedd (diff)
downloadbarebox-e2805b5ee515baa5f3319811db9d839cca215707.tar.gz
scripts: mxsimage: Fix build with OpenSSL < 1.1.x
Move the compatibility wrapper functions up so that they are defined before they are used. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--scripts/mxsimage.c62
1 files 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;