summaryrefslogtreecommitdiffstats
path: root/fips
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-10-14 12:02:53 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-10-14 12:02:53 +0000
commit2d183e4c44b1d18fe515739ec72c76d471a4b669 (patch)
tree3f5e7464e1b2ca6921026ee1a90ca6db39e1a848 /fips
parent7049d13c5fffab33b70c00df87c769966256f0a8 (diff)
Add BSD-ppc85xx support and avoid copying overlapping buffers in fips_dssvs.cOpenSSL-fips-2_0_2
Diffstat (limited to 'fips')
-rw-r--r--fips/dsa/fips_dssvs.c3
-rw-r--r--fips/fips_canister.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index e2f2297f00..cee5fb398e 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -46,7 +46,8 @@ static int parse_mod(char *line, int *pdsa2, int *pL, int *pN,
if (strcmp(keyword, "L"))
return 0;
*pL = atoi(value);
- strcpy(line, p + 1);
+ strcpy(lbuf, p + 1);
+ strcpy(line, lbuf);
if (pmd)
p = strchr(line, ',');
else
diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index afe55a1bc7..016d94c976 100644
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -32,6 +32,7 @@ const void *FIPS_text_end(void);
defined(__i386__)|| defined(__i386))) || \
(defined(__vxworks) && (defined(__ppc__) || defined(__ppc) || \
defined(__mips__)|| defined(__mips))) || \
+ (defined(__NetBSD__) && (defined(__powerpc__) || defined(__i386))) || \
(defined(__linux) && ((defined(__PPC__) && !defined(__PPC64__)) || \
defined(__arm__) || defined(__arm))) || \
(defined(__APPLE__) /* verified on all MacOS X & iOS flavors */)|| \