deregister; no binary change

ok jsing@ miod@

6 files changed, 23 insertions, 23 deletions

diff --git a/src/lib/libcrypto/bn/asm/x86_64-gcc.c b/src/lib/libcrypto/bn/asm/x86_64-gcc.c
index 5c12063dcf..c9a2b6be73 100644
--- a/src/lib/libcrypto/bn/asm/x86_64-gcc.c
+++ b/src/lib/libcrypto/bn/asm/x86_64-gcc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x86_64-gcc.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: x86_64-gcc.c,v 1.4 2014/10/28 07:35:58 jsg Exp $ */
 #include "../bn_lcl.h"
 #if !(defined(__GNUC__) && __GNUC__>=2)
 # include "../bn_asm.c" /* kind of dirty hack for Sun Studio */
@@ -68,7 +68,7 @@
  *                      want to keep the value of zero;
  */
 #define mul_add(r,a,word,carry) do {    \
-        register BN_ULONG high,low;     \
+        BN_ULONG high,low;      \
         asm ("mulq %3"                  \
                 : "=a"(low),"=d"(high)  \
                 : "a"(word),"m"(a)      \
@@ -85,7 +85,7 @@
         } while (0)
 
 #define mul(r,a,word,carry) do {        \
-        register BN_ULONG high,low;     \
+        BN_ULONG high,low;      \
         asm ("mulq %3"                  \
                 : "=a"(low),"=d"(high)  \
                 : "a"(word),"g"(a)      \
diff --git a/src/lib/libcrypto/bn/bn_add.c b/src/lib/libcrypto/bn/bn_add.c
index 5b2e2495b8..ebc9b9b56b 100644
--- a/src/lib/libcrypto/bn/bn_add.c
+++ b/src/lib/libcrypto/bn/bn_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_add.c,v 1.9 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: bn_add.c,v 1.10 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -170,7 +170,7 @@ int
 BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
 {
         int max, min, dif;
-        register BN_ULONG t1, t2, *ap, *bp, *rp;
+        BN_ULONG t1, t2, *ap, *bp, *rp;
         int i, carry;
 
         bn_check_top(a);
diff --git a/src/lib/libcrypto/bn/bn_gf2m.c b/src/lib/libcrypto/bn/bn_gf2m.c
index d87f80d577..1cd38c7797 100644
--- a/src/lib/libcrypto/bn/bn_gf2m.c
+++ b/src/lib/libcrypto/bn/bn_gf2m.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_gf2m.c,v 1.15 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: bn_gf2m.c,v 1.16 2014/10/28 07:35:58 jsg Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -137,9 +137,9 @@ static void
 bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
 {
 #ifndef _LP64
-        register BN_ULONG h, l, s;
+        BN_ULONG h, l, s;
         BN_ULONG tab[8], top2b = a >> 30;
-        register BN_ULONG a1, a2, a4;
+        BN_ULONG a1, a2, a4;
 
         a1 = a & (0x3FFFFFFF);
         a2 = a1 << 1;
@@ -200,9 +200,9 @@ bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
         *r1 = h;
         *r0 = l;
 #else
-        register BN_ULONG h, l, s;
+        BN_ULONG h, l, s;
         BN_ULONG tab[16], top3b = a >> 61;
-        register BN_ULONG a1, a2, a4, a8;
+        BN_ULONG a1, a2, a4, a8;
 
         a1 = a & (0x1FFFFFFFFFFFFFFFULL);
         a2 = a1 << 1;
diff --git a/src/lib/libcrypto/bn/bn_lcl.h b/src/lib/libcrypto/bn/bn_lcl.h
index 2dab445a51..a76ba4149f 100644
--- a/src/lib/libcrypto/bn/bn_lcl.h
+++ b/src/lib/libcrypto/bn/bn_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_lcl.h,v 1.20 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: bn_lcl.h,v 1.21 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -227,7 +227,7 @@ extern "C" {
 # if defined(__alpha)
 #  if defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
-        register BN_ULONG ret;          \
+        BN_ULONG ret;           \
         asm ("umulh     %1,%2,%0"       \
              : "=r"(ret)                \
              : "r"(a), "r"(b));         \
@@ -236,7 +236,7 @@ extern "C" {
 # elif defined(_ARCH_PPC) && defined(_LP64)
 #  if defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
-        register BN_ULONG ret;          \
+        BN_ULONG ret;           \
         asm ("mulhdu    %0,%1,%2"       \
              : "=r"(ret)                \
              : "r"(a), "r"(b));         \
@@ -245,7 +245,7 @@ extern "C" {
 # elif defined(__x86_64) || defined(__x86_64__)
 #  if defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
-        register BN_ULONG ret,discard;  \
+        BN_ULONG ret,discard;   \
         asm ("mulq      %3"             \
              : "=a"(discard),"=d"(ret)  \
              : "a"(a), "g"(b)           \
@@ -266,7 +266,7 @@ extern "C" {
         (high)=ret>>64; (low)=ret;       })
 #   else
 #     define BN_UMULT_HIGH(a,b) ({      \
-        register BN_ULONG ret;          \
+        BN_ULONG ret;           \
         asm ("dmultu    %1,%2"          \
              : "=h"(ret)                \
              : "r"(a), "r"(b) : "l");   \
diff --git a/src/lib/libcrypto/bn/bn_nist.c b/src/lib/libcrypto/bn/bn_nist.c
index 53ed559c06..693d6f1ed3 100644
--- a/src/lib/libcrypto/bn/bn_nist.c
+++ b/src/lib/libcrypto/bn/bn_nist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_nist.c,v 1.14 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_nist.c,v 1.15 2014/10/28 07:35:58 jsg Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -424,7 +424,7 @@ BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
 {
         int top = a->top, i;
         int carry;
-        register BN_ULONG *r_d, *a_d = a->d;
+        BN_ULONG *r_d, *a_d = a->d;
         union {
                 BN_ULONG bn[BN_NIST_192_TOP];
                 unsigned int ui[BN_NIST_192_TOP *
@@ -740,7 +740,7 @@ BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
 {
         int i, top = a->top;
         int carry = 0;
-        register BN_ULONG *a_d = a->d, *r_d;
+        BN_ULONG *a_d = a->d, *r_d;
         union {
                 BN_ULONG bn[BN_NIST_256_TOP];
                 unsigned int ui[BN_NIST_256_TOP *
@@ -888,7 +888,7 @@ BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
                 carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
                 /* left shift */
                 {
-                        register BN_ULONG *ap, t, c;
+                        BN_ULONG *ap, t, c;
                         ap = t_d;
                         c = 0;
                         for (i = BN_NIST_256_TOP; i != 0; --i) {
@@ -967,7 +967,7 @@ BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
 {
         int i, top = a->top;
         int carry = 0;
-        register BN_ULONG *r_d, *a_d = a->d;
+        BN_ULONG *r_d, *a_d = a->d;
         union {
                 BN_ULONG bn[BN_NIST_384_TOP];
                 unsigned int ui[BN_NIST_384_TOP *
@@ -1140,7 +1140,7 @@ BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
                     21 - 4);
                 /* left shift */
                 {
-                        register BN_ULONG *ap, t, c;
+                        BN_ULONG *ap, t, c;
                         ap = t_d;
                         c = 0;
                         for (i = 3; i != 0; --i) {
diff --git a/src/lib/libcrypto/bn/bn_shift.c b/src/lib/libcrypto/bn/bn_shift.c
index 771ddff7b0..0e8211e3d6 100644
--- a/src/lib/libcrypto/bn/bn_shift.c
+++ b/src/lib/libcrypto/bn/bn_shift.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_shift.c,v 1.12 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_shift.c,v 1.13 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,7 +64,7 @@
 int
 BN_lshift1(BIGNUM *r, const BIGNUM *a)
 {
-        register BN_ULONG *ap, *rp, t, c;
+        BN_ULONG *ap, *rp, t, c;
         int i;
 
         bn_check_top(r);