diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-06 09:43:49 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-05-17 08:16:16 +0200 |
| commit | c8e25e31fb1ee2dd1918c985a76799c0051d6857 (patch) | |
| tree | 4fb60799b1630309538f065c8278f032c3046b35 /patches | |
| parent | b4239dfc954e10664c484f74b217b050521dbad4 (diff) | |
| download | ptxdist-c8e25e31fb1ee2dd1918c985a76799c0051d6857.tar.gz ptxdist-c8e25e31fb1ee2dd1918c985a76799c0051d6857.tar.xz | |
libmd: various build fixes
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch | 24 | ||||
| -rw-r--r-- | patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch | 44 | ||||
| -rw-r--r-- | patches/libmd-0.3.1/series | 5 |
3 files changed, 73 insertions, 0 deletions
diff --git a/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch b/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch new file mode 100644 index 000000000..8f5f22759 --- /dev/null +++ b/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 5 Aug 2014 07:16:41 +0200 +Subject: [PATCH] fix building on x86_64 + +for x86_64: unsigned int != size_t + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + include/rmd160.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/rmd160.h b/include/rmd160.h +index 0dd08677f539..7ecb62a6b732 100644 +--- a/include/rmd160.h ++++ b/include/rmd160.h +@@ -31,7 +31,7 @@ typedef struct RMD160Context { + + __BEGIN_DECLS + void RMD160Init(RMD160_CTX *); +-void RMD160Update(RMD160_CTX *, const unsigned char *, unsigned int); ++void RMD160Update(RMD160_CTX *, const unsigned char *, size_t); + void RMD160Final(unsigned char [RMD160_HASHBYTES], RMD160_CTX *); + char * RMD160End(RMD160_CTX *, char *); + char * RMD160File(const char *, char *); diff --git a/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch b/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch new file mode 100644 index 000000000..2400d0f96 --- /dev/null +++ b/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch @@ -0,0 +1,44 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 5 May 2015 23:40:01 +0200 +Subject: [PATCH] fix incorrect memcpy()/memset() size argument + +Arrays as function arguments are realy pointers so sizeof(digest) == +sizeof(unsigned char*) != 20 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + src/rmd160.c | 2 +- + src/sha.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/rmd160.c b/src/rmd160.c +index ec047fe33b28..87d9674aab0b 100644 +--- a/src/rmd160.c ++++ b/src/rmd160.c +@@ -444,5 +444,5 @@ RMD160Final (unsigned char digest[20], RMD160_CTX * ctx) + digest[i * 4 + 3] = (u_int8_t) (t >> 24); + } + +- memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */ ++ memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */ + } +diff --git a/src/sha.c b/src/sha.c +index 779ace1de031..d24c5537d8ac 100644 +--- a/src/sha.c ++++ b/src/sha.c +@@ -344,7 +344,7 @@ SHAFinal (unsigned char digest[20], SHA_CTX * ctx) + #endif + SHATransform (ctx); + +- memcpy (digest, ctx->iv, sizeof (digest)); ++ memcpy (digest, ctx->iv, 20); + for (i = 0; i < SHA_HASHWORDS; i++) + { + t = ctx->iv[i]; +@@ -354,5 +354,5 @@ SHAFinal (unsigned char digest[20], SHA_CTX * ctx) + digest[i * 4 + 3] = (u_int8_t) t; + } + +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + } diff --git a/patches/libmd-0.3.1/series b/patches/libmd-0.3.1/series new file mode 100644 index 000000000..7d89fa959 --- /dev/null +++ b/patches/libmd-0.3.1/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-building-on-x86_64.patch +0002-fix-incorrect-memcpy-memset-size-argument.patch +# c1c9261075f56369b9e67a084f309c60 - git-ptx-patches magic |