summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/lib/libcrypto/sha/asm/sha512-ppc.pl2
-rwxr-xr-xsrc/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl2
-rw-r--r--src/usr.bin/openssl/apps.c4
-rw-r--r--src/usr.bin/openssl/req.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/sha/asm/sha512-ppc.pl b/src/lib/libcrypto/sha/asm/sha512-ppc.pl
index f561f313c6..2a7d5a0e8b 100755
--- a/src/lib/libcrypto/sha/asm/sha512-ppc.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-ppc.pl
@@ -20,7 +20,7 @@
20# 20#
21# (*) 64-bit code in 32-bit application context, which actually is 21# (*) 64-bit code in 32-bit application context, which actually is
22# on TODO list. It should be noted that for safe deployment in 22# on TODO list. It should be noted that for safe deployment in
23# 32-bit *mutli-threaded* context asynchronous signals should be 23# 32-bit *multi-threaded* context asynchronous signals should be
24# blocked upon entry to SHA512 block routine. This is because 24# blocked upon entry to SHA512 block routine. This is because
25# 32-bit signaling procedure invalidates upper halves of GPRs. 25# 32-bit signaling procedure invalidates upper halves of GPRs.
26# Context switch procedure preserves them, but not signaling:-( 26# Context switch procedure preserves them, but not signaling:-(
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl b/src/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl
index f561f313c6..2a7d5a0e8b 100755
--- a/src/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl
@@ -20,7 +20,7 @@
20# 20#
21# (*) 64-bit code in 32-bit application context, which actually is 21# (*) 64-bit code in 32-bit application context, which actually is
22# on TODO list. It should be noted that for safe deployment in 22# on TODO list. It should be noted that for safe deployment in
23# 32-bit *mutli-threaded* context asynchronous signals should be 23# 32-bit *multi-threaded* context asynchronous signals should be
24# blocked upon entry to SHA512 block routine. This is because 24# blocked upon entry to SHA512 block routine. This is because
25# 32-bit signaling procedure invalidates upper halves of GPRs. 25# 32-bit signaling procedure invalidates upper halves of GPRs.
26# Context switch procedure preserves them, but not signaling:-( 26# Context switch procedure preserves them, but not signaling:-(
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index c2b786d3f9..153504c503 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: apps.c,v 1.36 2015/09/13 12:41:01 bcook Exp $ */ 1/* $OpenBSD: apps.c,v 1.37 2015/11/14 14:53:14 miod Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -1801,7 +1801,7 @@ parse_name(char *subject, long chtype, int multirdn)
1801 mval[ne_num + 1] = 0; 1801 mval[ne_num + 1] = 0;
1802 break; 1802 break;
1803 } else if (*sp == '+' && multirdn) { 1803 } else if (*sp == '+' && multirdn) {
1804 /* a not escaped + signals a mutlivalued RDN */ 1804 /* a not escaped + signals a multivalued RDN */
1805 sp++; 1805 sp++;
1806 mval[ne_num + 1] = -1; 1806 mval[ne_num + 1] = -1;
1807 break; 1807 break;
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c
index 3a52f58831..e264870374 100644
--- a/src/usr.bin/openssl/req.c
+++ b/src/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: req.c,v 1.12 2015/10/17 15:00:11 doug Exp $ */ 1/* $OpenBSD: req.c,v 1.13 2015/11/14 14:53:14 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -120,7 +120,7 @@
120 * require. This format is wrong 120 * require. This format is wrong
121 */ 121 */
122 122
123static int make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *dn, int mutlirdn, 123static int make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *dn, int multirdn,
124 int attribs, unsigned long chtype); 124 int attribs, unsigned long chtype);
125static int build_subject(X509_REQ * req, char *subj, unsigned long chtype, 125static int build_subject(X509_REQ * req, char *subj, unsigned long chtype,
126 int multirdn); 126 int multirdn);