100 files changed, 460 insertions, 460 deletions

diff --git a/src/lib/libcrypto/aes/aes_x86core.c b/src/lib/libcrypto/aes/aes_x86core.c
index 5cd215e5df..c7a2e0a9a6 100644
--- a/src/lib/libcrypto/aes/aes_x86core.c
+++ b/src/lib/libcrypto/aes/aes_x86core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes_x86core.c,v 1.6 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: aes_x86core.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /**
  * rijndael-alg-fst.c
  *
@@ -90,7 +90,7 @@ typedef unsigned long long u64;
 #undef ROTATE
 #if defined(__GNUC__) && __GNUC__>=2
 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
+#   define ROTATE(a,n)  ({ unsigned int ret;    \
                                 asm (                   \
                                 "roll %1,%0"            \
                                 : "=r"(ret)             \
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c
index bf8d2c5c48..6f45f9ae4c 100644
--- a/src/lib/libcrypto/bf/bf_cbc.c
+++ b/src/lib/libcrypto/bf/bf_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_cbc.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_cbc.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        BF_LONG tin0,tin1;
+        BF_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         BF_LONG tin[2];
 
         if (encrypt)
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c
index 4c31d70430..6cc0bb999b 100644
--- a/src/lib/libcrypto/bf/bf_cfb64.c
+++ b/src/lib/libcrypto/bf/bf_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_cfb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,9 +67,9 @@
 void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
         {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        BF_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         BF_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c
index a984139543..2cf1c86063 100644
--- a/src/lib/libcrypto/bf/bf_enc.c
+++ b/src/lib/libcrypto/bf/bf_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,8 +72,8 @@ to modify the code.
 void BF_encrypt(BF_LONG *data, const BF_KEY *key)
         {
 #ifndef BF_PTR2
-        register BF_LONG l,r;
-        register const BF_LONG *p,*s;
+        BF_LONG l,r;
+        const BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -108,7 +108,7 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
 #else
-        register BF_LONG l,r,t,*k;
+        BF_LONG l,r,t,*k;
 
         l=data[0];
         r=data[1];
@@ -149,8 +149,8 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
 void BF_decrypt(BF_LONG *data, const BF_KEY *key)
         {
 #ifndef BF_PTR2
-        register BF_LONG l,r;
-        register const BF_LONG *p,*s;
+        BF_LONG l,r;
+        const BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -185,7 +185,7 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
 #else
-        register BF_LONG l,r,t,*k;
+        BF_LONG l,r,t,*k;
 
         l=data[0];
         r=data[1];
@@ -224,9 +224,9 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
 void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        BF_LONG tin0,tin1;
+        BF_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         BF_LONG tin[2];
 
         if (encrypt)
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c
index 6d9a55cb07..9e33162aab 100644
--- a/src/lib/libcrypto/bf/bf_ofb64.c
+++ b/src/lib/libcrypto/bf/bf_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_ofb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,11 +66,11 @@
 void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int *num)
         {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        BF_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         BF_LONG ti[2];
         unsigned char *iv;
         int save=0;
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);
diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c
index f400bc9ff7..fa925b72a9 100644
--- a/src/lib/libcrypto/camellia/camellia.c
+++ b/src/lib/libcrypto/camellia/camellia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: camellia.c,v 1.7 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: camellia.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* ====================================================================
  * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
  * ALL RIGHTS RESERVED.
@@ -314,7 +314,7 @@ static const u32 SIGMA[] = {
  * specific] assembler version should be/is provided anyway...
  */
 #define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\
-        register u32 _t0,_t1,_t2,_t3;\
+        u32 _t0,_t1,_t2,_t3;\
 \
         _t0  = _s0 ^ (_key)[0];\
         _t3  = SBOX4_4404[_t0&0xff];\
@@ -348,7 +348,7 @@ static const u32 SIGMA[] = {
 
 int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
         {
-        register u32 s0,s1,s2,s3;
+        u32 s0,s1,s2,s3;
 
         k[0] = s0 = GETU32(rawKey);
         k[1] = s1 = GETU32(rawKey+4);
@@ -473,7 +473,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
 void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], 
                 const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
         {
-        register u32 s0,s1,s2,s3; 
+        u32 s0,s1,s2,s3; 
         const u32 *k = keyTable,*kend = keyTable+grandRounds*16; 
 
         s0 = GETU32(plaintext)    ^ k[0];
diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c
index 77a02d6dd8..726d19e005 100644
--- a/src/lib/libcrypto/cast/c_cfb64.c
+++ b/src/lib/libcrypto/cast/c_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_cfb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, const CAST_KEY *schedule, unsigned char *ivec,
                         int *num, int enc)
         {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        CAST_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         CAST_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c
index 4305c3108c..5999a59031 100644
--- a/src/lib/libcrypto/cast/c_enc.c
+++ b/src/lib/libcrypto/cast/c_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,8 +62,8 @@
 #ifndef OPENBSD_CAST_ASM
 void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
         {
-        register CAST_LONG l,r,t;
-        register const CAST_LONG *k;
+        CAST_LONG l,r,t;
+        const CAST_LONG *k;
 
         k= &(key->data[0]);
         l=data[0];
@@ -95,8 +95,8 @@ void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
 
 void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
         {
-        register CAST_LONG l,r,t;
-        register const CAST_LONG *k;
+        CAST_LONG l,r,t;
+        const CAST_LONG *k;
 
         k= &(key->data[0]);
         l=data[0];
@@ -130,9 +130,9 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
 void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const CAST_KEY *ks, unsigned char *iv, int enc)
         {
-        register CAST_LONG tin0,tin1;
-        register CAST_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        CAST_LONG tin0,tin1;
+        CAST_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         CAST_LONG tin[2];
 
         if (enc)
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c
index dc5eebf56b..611425a668 100644
--- a/src/lib/libcrypto/cast/c_ofb64.c
+++ b/src/lib/libcrypto/cast/c_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_ofb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, const CAST_KEY *schedule, unsigned char *ivec,
                         int *num)
         {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        CAST_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         CAST_LONG ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libcrypto/des/cbc_cksm.c b/src/lib/libcrypto/des/cbc_cksm.c
index c1fc81af57..20553ef09f 100644
--- a/src/lib/libcrypto/des/cbc_cksm.c
+++ b/src/lib/libcrypto/des/cbc_cksm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbc_cksm.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cbc_cksm.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,8 +62,8 @@ DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
                        long length, DES_key_schedule *schedule,
                        const_DES_cblock *ivec)
         {
-        register DES_LONG tout0,tout1,tin0,tin1;
-        register long l=length;
+        DES_LONG tout0,tout1,tin0,tin1;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *out = &(*output)[0];
         const unsigned char *iv = &(*ivec)[0];
diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c
index 62f4ae2ac2..0b5c7d6249 100644
--- a/src/lib/libcrypto/des/cfb64ede.c
+++ b/src/lib/libcrypto/des/cfb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb64ede.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cfb64ede.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                             DES_key_schedule *ks2, DES_key_schedule *ks3,
                             DES_cblock *ivec, int *num, int enc)
         {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
+        DES_LONG v0,v1;
+        long l=length;
+        int n= *num;
         DES_LONG ti[2];
         unsigned char *iv,c,cc;
 
@@ -150,9 +150,9 @@ void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out,
                           DES_key_schedule *ks2,DES_key_schedule *ks3,
                           DES_cblock *ivec,int enc)
         {
-        register DES_LONG d0,d1,v0,v1;
-        register unsigned long l=length,n=((unsigned int)numbits+7)/8;
-        register int num=numbits,i;
+        DES_LONG d0,d1,v0,v1;
+        unsigned long l=length,n=((unsigned int)numbits+7)/8;
+        int num=numbits,i;
         DES_LONG ti[2];
         unsigned char *iv;
         unsigned char ovec[16];
diff --git a/src/lib/libcrypto/des/cfb64enc.c b/src/lib/libcrypto/des/cfb64enc.c
index 86d626beb3..6c8f99e841 100644
--- a/src/lib/libcrypto/des/cfb64enc.c
+++ b/src/lib/libcrypto/des/cfb64enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb64enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cfb64enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,9 +67,9 @@ void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, DES_key_schedule *schedule,
                        DES_cblock *ivec, int *num, int enc)
         {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
+        DES_LONG v0,v1;
+        long l=length;
+        int n= *num;
         DES_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index b8c510067c..d654a6a8e2 100644
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ b/src/lib/libcrypto/des/cfb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb_enc.c,v 1.11 2014/07/09 16:06:13 miod Exp $ */
+/* $OpenBSD: cfb_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,9 +72,9 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                      long length, DES_key_schedule *schedule, DES_cblock *ivec,
                      int enc)
         {
-        register DES_LONG d0,d1,v0,v1;
-        register unsigned long l=length;
-        register int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
+        DES_LONG d0,d1,v0,v1;
+        unsigned long l=length;
+        int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
         DES_LONG ti[2];
         unsigned char *iv;
 #if BYTE_ORDER != LITTLE_ENDIAN
diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c
index 9f14cc96e4..1de35e1e34 100644
--- a/src/lib/libcrypto/des/des_enc.c
+++ b/src/lib/libcrypto/des/des_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_enc.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: des_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,14 +63,14 @@
 
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
 #ifndef DES_UNROLL
-        register int i;
+        int i;
 #endif
-        register DES_LONG *s;
+        DES_LONG *s;
 
         r=data[0];
         l=data[1];
@@ -157,14 +157,14 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
 
 void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
 #ifndef DES_UNROLL
-        register int i;
+        int i;
 #endif
-        register DES_LONG *s;
+        DES_LONG *s;
 
         r=data[0];
         l=data[1];
@@ -247,7 +247,7 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
                   DES_key_schedule *ks2, DES_key_schedule *ks3)
         {
-        register DES_LONG l,r;
+        DES_LONG l,r;
 
         l=data[0];
         r=data[1];
@@ -267,7 +267,7 @@ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
 void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
                   DES_key_schedule *ks2, DES_key_schedule *ks3)
         {
-        register DES_LONG l,r;
+        DES_LONG l,r;
 
         l=data[0];
         r=data[1];
@@ -294,11 +294,11 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
                           DES_key_schedule *ks2, DES_key_schedule *ks3,
                           DES_cblock *ivec, int enc)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register const unsigned char *in;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        const unsigned char *in;
         unsigned char *out;
-        register long l=length;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
@@ -347,7 +347,7 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
                 }
         else
                 {
-                register DES_LONG t0,t1;
+                DES_LONG t0,t1;
 
                 c2l(iv,xor0);
                 c2l(iv,xor1);
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
index 9480d37489..38ac68a6e6 100644
--- a/src/lib/libcrypto/des/des_locl.h
+++ b/src/lib/libcrypto/des/des_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_locl.h,v 1.17 2014/08/18 19:15:34 bcook Exp $ */
+/* $OpenBSD: des_locl.h,v 1.18 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -363,7 +363,7 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
 
 #define IP(l,r) \
         { \
-        register DES_LONG tt; \
+        DES_LONG tt; \
         PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
         PERM_OP(l,r,tt,16,0x0000ffffL); \
         PERM_OP(r,l,tt, 2,0x33333333L); \
@@ -373,7 +373,7 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
 
 #define FP(l,r) \
         { \
-        register DES_LONG tt; \
+        DES_LONG tt; \
         PERM_OP(l,r,tt, 1,0x55555555L); \
         PERM_OP(r,l,tt, 8,0x00ff00ffL); \
         PERM_OP(l,r,tt, 2,0x33333333L); \
diff --git a/src/lib/libcrypto/des/ecb3_enc.c b/src/lib/libcrypto/des/ecb3_enc.c
index 394b71b4b1..97de804cfb 100644
--- a/src/lib/libcrypto/des/ecb3_enc.c
+++ b/src/lib/libcrypto/des/ecb3_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecb3_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ecb3_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,7 +63,7 @@ void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
                       DES_key_schedule *ks3,
              int enc)
         {
-        register DES_LONG l0,l1;
+        DES_LONG l0,l1;
         DES_LONG ll[2];
         const unsigned char *in = &(*input)[0];
         unsigned char *out = &(*output)[0];
diff --git a/src/lib/libcrypto/des/ecb_enc.c b/src/lib/libcrypto/des/ecb_enc.c
index 8eaf3e9582..dac37de882 100644
--- a/src/lib/libcrypto/des/ecb_enc.c
+++ b/src/lib/libcrypto/des/ecb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecb_enc.c,v 1.15 2014/07/09 11:10:50 bcook Exp $ */
+/* $OpenBSD: ecb_enc.c,v 1.16 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -104,7 +104,7 @@ const char *DES_options(void)
 void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
                      DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l;
+        DES_LONG l;
         DES_LONG ll[2];
         const unsigned char *in = &(*input)[0];
         unsigned char *out = &(*output)[0];
diff --git a/src/lib/libcrypto/des/ede_cbcm_enc.c b/src/lib/libcrypto/des/ede_cbcm_enc.c
index 8fc6e1abf6..9a9f51e311 100644
--- a/src/lib/libcrypto/des/ede_cbcm_enc.c
+++ b/src/lib/libcrypto/des/ede_cbcm_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ede_cbcm_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ede_cbcm_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Written by Ben Laurie <ben@algroup.co.uk> for the OpenSSL
  * project 13 Feb 1999.
  */
@@ -78,9 +78,9 @@ void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
              DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2,
              int enc)
     {
-    register DES_LONG tin0,tin1;
-    register DES_LONG tout0,tout1,xor0,xor1,m0,m1;
-    register long l=length;
+    DES_LONG tin0,tin1;
+    DES_LONG tout0,tout1,xor0,xor1,m0,m1;
+    long l=length;
     DES_LONG tin[2];
     unsigned char *iv1,*iv2;
 
@@ -138,7 +138,7 @@ void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
         }
     else
         {
-        register DES_LONG t0,t1;
+        DES_LONG t0,t1;
 
         c2l(iv1,m0);
         c2l(iv1,m1);
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c
index 27a1617845..ad11a47d88 100644
--- a/src/lib/libcrypto/des/fcrypt_b.c
+++ b/src/lib/libcrypto/des/fcrypt_b.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fcrypt_b.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: fcrypt_b.c,v 1.9 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,13 +82,13 @@
 void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
                  DES_LONG Eswap1)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
-        register DES_LONG *s;
-        register int j;
-        register DES_LONG E0,E1;
+        DES_LONG *s;
+        int j;
+        DES_LONG E0,E1;
 
         l=0;
         r=0;
@@ -100,7 +100,7 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
         for (j=0; j<25; j++)
                 {
 #ifndef DES_UNROLL
-                register int i;
+                int i;
 
                 for (i=0; i<32; i+=4)
                         {
diff --git a/src/lib/libcrypto/des/ncbc_enc.c b/src/lib/libcrypto/des/ncbc_enc.c
index 0c5b234948..212796237d 100644
--- a/src/lib/libcrypto/des/ncbc_enc.c
+++ b/src/lib/libcrypto/des/ncbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncbc_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ncbc_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /*
  * #included by:
  *    cbc_enc.c  (DES_cbc_encrypt)
@@ -71,9 +71,9 @@ void DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                      DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
 #endif
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
diff --git a/src/lib/libcrypto/des/ofb64ede.c b/src/lib/libcrypto/des/ofb64ede.c
index 77bb4a5ef1..1d916e9305 100644
--- a/src/lib/libcrypto/des/ofb64ede.c
+++ b/src/lib/libcrypto/des/ofb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb64ede.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb64ede.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,17 +62,17 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void DES_ede3_ofb64_encrypt(register const unsigned char *in,
-                            register unsigned char *out, long length,
+void DES_ede3_ofb64_encrypt(const unsigned char *in,
+                            unsigned char *out, long length,
                             DES_key_schedule *k1, DES_key_schedule *k2,
                             DES_key_schedule *k3, DES_cblock *ivec,
                             int *num)
         {
-        register DES_LONG v0,v1;
-        register int n= *num;
-        register long l=length;
+        DES_LONG v0,v1;
+        int n= *num;
+        long l=length;
         DES_cblock d;
-        register char *dp;
+        char *dp;
         DES_LONG ti[2];
         unsigned char *iv;
         int save=0;
@@ -116,8 +116,8 @@ void DES_ede3_ofb64_encrypt(register const unsigned char *in,
         }
 
 #ifdef undef /* MACRO */
-void DES_ede2_ofb64_encrypt(register unsigned char *in,
-             register unsigned char *out, long length, DES_key_schedule k1,
+void DES_ede2_ofb64_encrypt(unsigned char *in,
+             unsigned char *out, long length, DES_key_schedule k1,
              DES_key_schedule k2, DES_cblock (*ivec), int *num)
         {
         DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
diff --git a/src/lib/libcrypto/des/ofb64enc.c b/src/lib/libcrypto/des/ofb64enc.c
index 2e547c29dd..de1a26b99f 100644
--- a/src/lib/libcrypto/des/ofb64enc.c
+++ b/src/lib/libcrypto/des/ofb64enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb64enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb64enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,15 +62,15 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void DES_ofb64_encrypt(register const unsigned char *in,
-                       register unsigned char *out, long length,
+void DES_ofb64_encrypt(const unsigned char *in,
+                       unsigned char *out, long length,
                        DES_key_schedule *schedule, DES_cblock *ivec, int *num)
         {
-        register DES_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        DES_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         DES_cblock d;
-        register unsigned char *dp;
+        unsigned char *dp;
         DES_LONG ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libcrypto/des/ofb_enc.c b/src/lib/libcrypto/des/ofb_enc.c
index 7429f39a17..8cc5bbcb1e 100644
--- a/src/lib/libcrypto/des/ofb_enc.c
+++ b/src/lib/libcrypto/des/ofb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,10 +68,10 @@ void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                      long length, DES_key_schedule *schedule,
                      DES_cblock *ivec)
         {
-        register DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8;
-        register DES_LONG mask0,mask1;
-        register long l=length;
-        register int num=numbits;
+        DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8;
+        DES_LONG mask0,mask1;
+        long l=length;
+        int num=numbits;
         DES_LONG ti[2];
         unsigned char *iv;
 
diff --git a/src/lib/libcrypto/des/pcbc_enc.c b/src/lib/libcrypto/des/pcbc_enc.c
index 3eeab022a4..fda18ba83d 100644
--- a/src/lib/libcrypto/des/pcbc_enc.c
+++ b/src/lib/libcrypto/des/pcbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcbc_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: pcbc_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,7 +62,7 @@ void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                       long length, DES_key_schedule *schedule,
                       DES_cblock *ivec, int enc)
         {
-        register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
+        DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
         DES_LONG tin[2];
         const unsigned char *in;
         unsigned char *out,*iv;
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
index 1901ecd647..59d6893a80 100644
--- a/src/lib/libcrypto/des/set_key.c
+++ b/src/lib/libcrypto/des/set_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set_key.c,v 1.18 2014/10/12 20:48:58 miod Exp $ */
+/* $OpenBSD: set_key.c,v 1.19 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -334,10 +334,10 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
         {
         static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-        register DES_LONG c,d,t,s,t2;
-        register const unsigned char *in;
-        register DES_LONG *k;
-        register int i;
+        DES_LONG c,d,t,s,t2;
+        const unsigned char *in;
+        DES_LONG *k;
+        int i;
 
         k = &schedule->ks->deslong[0];
         in = &(*key)[0];
diff --git a/src/lib/libcrypto/des/str2key.c b/src/lib/libcrypto/des/str2key.c
index ffbfbafa93..8999eb292a 100644
--- a/src/lib/libcrypto/des/str2key.c
+++ b/src/lib/libcrypto/des/str2key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str2key.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: str2key.c,v 1.9 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,7 +63,7 @@ void DES_string_to_key(const char *str, DES_cblock *key)
         {
         DES_key_schedule ks;
         int i,length;
-        register unsigned char j;
+        unsigned char j;
 
         memset(key,0,8);
         length=strlen(str);
@@ -103,7 +103,7 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
         {
         DES_key_schedule ks;
         int i,length;
-        register unsigned char j;
+        unsigned char j;
 
         memset(key1,0,8);
         memset(key2,0,8);
diff --git a/src/lib/libcrypto/des/xcbc_enc.c b/src/lib/libcrypto/des/xcbc_enc.c
index 744021c255..dc4607e8aa 100644
--- a/src/lib/libcrypto/des/xcbc_enc.c
+++ b/src/lib/libcrypto/des/xcbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xcbc_enc.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: xcbc_enc.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -114,11 +114,11 @@ void DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                       DES_cblock *ivec, const_DES_cblock *inw,
                       const_DES_cblock *outw, int enc)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register DES_LONG inW0,inW1,outW0,outW1;
-        register const unsigned char *in2;
-        register long l=length;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        DES_LONG inW0,inW1,outW0,outW1;
+        const unsigned char *in2;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
diff --git a/src/lib/libcrypto/idea/i_cbc.c b/src/lib/libcrypto/idea/i_cbc.c
index 74f490d0c0..5bb9640c34 100644
--- a/src/lib/libcrypto/idea/i_cbc.c
+++ b/src/lib/libcrypto/idea/i_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_cbc.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_cbc.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
@@ -135,8 +135,8 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
 
 void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
         {
-        register IDEA_INT *p;
-        register unsigned long x1,x2,x3,x4,t0,t1,ul;
+        IDEA_INT *p;
+        unsigned long x1,x2,x3,x4,t0,t1,ul;
 
         x2=d[0];
         x1=(x2>>16);
diff --git a/src/lib/libcrypto/idea/i_cfb64.c b/src/lib/libcrypto/idea/i_cfb64.c
index 98fdd3ed00..b979aaef86 100644
--- a/src/lib/libcrypto/idea/i_cfb64.c
+++ b/src/lib/libcrypto/idea/i_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_cfb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_cfb64.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, IDEA_KEY_SCHEDULE *schedule,
                         unsigned char *ivec, int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/idea/i_ofb64.c b/src/lib/libcrypto/idea/i_ofb64.c
index cfef8ea95f..376dad9f6d 100644
--- a/src/lib/libcrypto/idea/i_ofb64.c
+++ b/src/lib/libcrypto/idea/i_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_ofb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_ofb64.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, IDEA_KEY_SCHEDULE *schedule,
                         unsigned char *ivec, int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libcrypto/idea/i_skey.c b/src/lib/libcrypto/idea/i_skey.c
index 8af1874598..2824d2618e 100644
--- a/src/lib/libcrypto/idea/i_skey.c
+++ b/src/lib/libcrypto/idea/i_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_skey.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_skey.c,v 1.4 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,7 +64,7 @@ static IDEA_INT inverse(unsigned int xin);
 void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
         {
         int i;
-        register IDEA_INT *kt,*kf,r0,r1,r2;
+        IDEA_INT *kt,*kf,r0,r1,r2;
 
         kt= &(ks->data[0][0]);
         n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]);
@@ -98,7 +98,7 @@ void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
 void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
         {
         int r;
-        register IDEA_INT *fp,*tp,t;
+        IDEA_INT *fp,*tp,t;
 
         tp= &(dk->data[0][0]);
         fp= &(ek->data[8][0]);
diff --git a/src/lib/libcrypto/md4/md4_dgst.c b/src/lib/libcrypto/md4/md4_dgst.c
index 22bb32c41b..d4a0c6ff06 100644
--- a/src/lib/libcrypto/md4/md4_dgst.c
+++ b/src/lib/libcrypto/md4/md4_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md4_dgst.c,v 1.13 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: md4_dgst.c,v 1.14 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int MD4_Init(MD4_CTX *c)
 void md4_block_data_order (MD4_CTX *c, const void *data_, size_t num)
         {
         const unsigned char *data=data_;
-        register unsigned MD32_REG_T A,B,C,D,l;
+        unsigned MD32_REG_T A,B,C,D,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
diff --git a/src/lib/libcrypto/md5/md5_dgst.c b/src/lib/libcrypto/md5/md5_dgst.c
index 6f2a2abceb..f55113727a 100644
--- a/src/lib/libcrypto/md5/md5_dgst.c
+++ b/src/lib/libcrypto/md5/md5_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5_dgst.c,v 1.13 2014/07/09 11:10:51 bcook Exp $ */
+/* $OpenBSD: md5_dgst.c,v 1.14 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int MD5_Init(MD5_CTX *c)
 void md5_block_data_order (MD5_CTX *c, const void *data_, size_t num)
         {
         const unsigned char *data=data_;
-        register unsigned MD32_REG_T A,B,C,D,l;
+        unsigned MD32_REG_T A,B,C,D,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
diff --git a/src/lib/libcrypto/mdc2/mdc2dgst.c b/src/lib/libcrypto/mdc2/mdc2dgst.c
index 6b29e04072..b4b0068d59 100644
--- a/src/lib/libcrypto/mdc2/mdc2dgst.c
+++ b/src/lib/libcrypto/mdc2/mdc2dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdc2dgst.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: mdc2dgst.c,v 1.7 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,8 +123,8 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len)
 
 static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG ttin0,ttin1;
+        DES_LONG tin0,tin1;
+        DES_LONG ttin0,ttin1;
         DES_LONG d[2],dd[2];
         DES_key_schedule k;
         unsigned char *p;
diff --git a/src/lib/libcrypto/rc2/rc2_cbc.c b/src/lib/libcrypto/rc2/rc2_cbc.c
index 7d826e32e1..a947f1d3c3 100644
--- a/src/lib/libcrypto/rc2/rc2_cbc.c
+++ b/src/lib/libcrypto/rc2/rc2_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2_cbc.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2_cbc.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              RC2_KEY *ks, unsigned char *iv, int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
@@ -136,8 +136,8 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
 void RC2_encrypt(unsigned long *d, RC2_KEY *key)
         {
         int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
+        RC2_INT *p0,*p1;
+        RC2_INT x0,x1,x2,x3,t;
         unsigned long l;
 
         l=d[0];
@@ -181,8 +181,8 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
 void RC2_decrypt(unsigned long *d, RC2_KEY *key)
         {
         int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
+        RC2_INT *p0,*p1;
+        RC2_INT x0,x1,x2,x3,t;
         unsigned long l;
 
         l=d[0];
diff --git a/src/lib/libcrypto/rc2/rc2cfb64.c b/src/lib/libcrypto/rc2/rc2cfb64.c
index 3da6a96457..95366444c4 100644
--- a/src/lib/libcrypto/rc2/rc2cfb64.c
+++ b/src/lib/libcrypto/rc2/rc2cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2cfb64.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2cfb64.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, RC2_KEY *schedule, unsigned char *ivec,
                        int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/rc2/rc2ofb64.c b/src/lib/libcrypto/rc2/rc2ofb64.c
index 58c765d456..c47b413739 100644
--- a/src/lib/libcrypto/rc2/rc2ofb64.c
+++ b/src/lib/libcrypto/rc2/rc2ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2ofb64.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2ofb64.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, RC2_KEY *schedule, unsigned char *ivec,
                        int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libcrypto/rc4/rc4_enc.c b/src/lib/libcrypto/rc4/rc4_enc.c
index 79051b3e2a..e68edddfea 100644
--- a/src/lib/libcrypto/rc4/rc4_enc.c
+++ b/src/lib/libcrypto/rc4/rc4_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_enc.c,v 1.12 2014/07/09 16:06:13 miod Exp $ */
+/* $OpenBSD: rc4_enc.c,v 1.13 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,8 +71,8 @@
 void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
              unsigned char *outdata)
         {
-        register RC4_INT *d;
-        register RC4_INT x,y,tx,ty;
+        RC4_INT *d;
+        RC4_INT x,y,tx,ty;
         size_t i;
         
         x=key->x;     
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c
index 455cd44d13..7ef4da3f15 100644
--- a/src/lib/libcrypto/rc4/rc4_skey.c
+++ b/src/lib/libcrypto/rc4/rc4_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_skey.c,v 1.12 2014/07/12 20:11:45 miod Exp $ */
+/* $OpenBSD: rc4_skey.c,v 1.13 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -85,9 +85,9 @@ const char *RC4_options(void)
 
 void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
         {
-        register RC4_INT tmp;
-        register int id1,id2;
-        register RC4_INT *d;
+        RC4_INT tmp;
+        int id1,id2;
+        RC4_INT *d;
         unsigned int i;
         
         d= &(key->data[0]);
diff --git a/src/lib/libcrypto/rc5/rc5_enc.c b/src/lib/libcrypto/rc5/rc5_enc.c
index 8fdbabe8b6..3828fe29c5 100644
--- a/src/lib/libcrypto/rc5/rc5_enc.c
+++ b/src/lib/libcrypto/rc5/rc5_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5_enc.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5_enc.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,9 +64,9 @@ void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
                         long length, RC5_32_KEY *ks, unsigned char *iv,
                         int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
diff --git a/src/lib/libcrypto/rc5/rc5cfb64.c b/src/lib/libcrypto/rc5/rc5cfb64.c
index eebf828e65..0f4d11248c 100644
--- a/src/lib/libcrypto/rc5/rc5cfb64.c
+++ b/src/lib/libcrypto/rc5/rc5cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5cfb64.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5cfb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libcrypto/rc5/rc5ofb64.c b/src/lib/libcrypto/rc5/rc5ofb64.c
index b823aeb148..0a8686092b 100644
--- a/src/lib/libcrypto/rc5/rc5ofb64.c
+++ b/src/lib/libcrypto/rc5/rc5ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5ofb64.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5ofb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libcrypto/ripemd/rmd_dgst.c b/src/lib/libcrypto/ripemd/rmd_dgst.c
index f26fc31bf3..458968d4a6 100644
--- a/src/lib/libcrypto/ripemd/rmd_dgst.c
+++ b/src/lib/libcrypto/ripemd/rmd_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmd_dgst.c,v 1.16 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: rmd_dgst.c,v 1.17 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int RIPEMD160_Init(RIPEMD160_CTX *c)
 void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E;
+        unsigned MD32_REG_T A,B,C,D,E;
         unsigned MD32_REG_T a,b,c,d,e,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h
index f92d9c4181..f2f9a31ee7 100644
--- a/src/lib/libcrypto/sha/sha_locl.h
+++ b/src/lib/libcrypto/sha/sha_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha_locl.h,v 1.18 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: sha_locl.h,v 1.19 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -206,7 +206,7 @@ int SHA1_Init(SHA_CTX *c)
 static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E,T,l;
+        unsigned MD32_REG_T A,B,C,D,E,T,l;
 #ifndef MD32_XARRAY
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
                                 XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
@@ -391,7 +391,7 @@ static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
 static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E,T,l;
+        unsigned MD32_REG_T A,B,C,D,E,T,l;
         int i;
         SHA_LONG        X[16];
 
diff --git a/src/lib/libssl/src/crypto/aes/aes_x86core.c b/src/lib/libssl/src/crypto/aes/aes_x86core.c
index 5cd215e5df..c7a2e0a9a6 100644
--- a/src/lib/libssl/src/crypto/aes/aes_x86core.c
+++ b/src/lib/libssl/src/crypto/aes/aes_x86core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes_x86core.c,v 1.6 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: aes_x86core.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /**
  * rijndael-alg-fst.c
  *
@@ -90,7 +90,7 @@ typedef unsigned long long u64;
 #undef ROTATE
 #if defined(__GNUC__) && __GNUC__>=2
 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
+#   define ROTATE(a,n)  ({ unsigned int ret;    \
                                 asm (                   \
                                 "roll %1,%0"            \
                                 : "=r"(ret)             \
diff --git a/src/lib/libssl/src/crypto/bf/bf_cbc.c b/src/lib/libssl/src/crypto/bf/bf_cbc.c
index bf8d2c5c48..6f45f9ae4c 100644
--- a/src/lib/libssl/src/crypto/bf/bf_cbc.c
+++ b/src/lib/libssl/src/crypto/bf/bf_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_cbc.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_cbc.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        BF_LONG tin0,tin1;
+        BF_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         BF_LONG tin[2];
 
         if (encrypt)
diff --git a/src/lib/libssl/src/crypto/bf/bf_cfb64.c b/src/lib/libssl/src/crypto/bf/bf_cfb64.c
index 4c31d70430..6cc0bb999b 100644
--- a/src/lib/libssl/src/crypto/bf/bf_cfb64.c
+++ b/src/lib/libssl/src/crypto/bf/bf_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_cfb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,9 +67,9 @@
 void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
         {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        BF_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         BF_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/bf/bf_enc.c b/src/lib/libssl/src/crypto/bf/bf_enc.c
index a984139543..2cf1c86063 100644
--- a/src/lib/libssl/src/crypto/bf/bf_enc.c
+++ b/src/lib/libssl/src/crypto/bf/bf_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,8 +72,8 @@ to modify the code.
 void BF_encrypt(BF_LONG *data, const BF_KEY *key)
         {
 #ifndef BF_PTR2
-        register BF_LONG l,r;
-        register const BF_LONG *p,*s;
+        BF_LONG l,r;
+        const BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -108,7 +108,7 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
 #else
-        register BF_LONG l,r,t,*k;
+        BF_LONG l,r,t,*k;
 
         l=data[0];
         r=data[1];
@@ -149,8 +149,8 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
 void BF_decrypt(BF_LONG *data, const BF_KEY *key)
         {
 #ifndef BF_PTR2
-        register BF_LONG l,r;
-        register const BF_LONG *p,*s;
+        BF_LONG l,r;
+        const BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -185,7 +185,7 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
 #else
-        register BF_LONG l,r,t,*k;
+        BF_LONG l,r,t,*k;
 
         l=data[0];
         r=data[1];
@@ -224,9 +224,9 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
 void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        BF_LONG tin0,tin1;
+        BF_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         BF_LONG tin[2];
 
         if (encrypt)
diff --git a/src/lib/libssl/src/crypto/bf/bf_ofb64.c b/src/lib/libssl/src/crypto/bf/bf_ofb64.c
index 6d9a55cb07..9e33162aab 100644
--- a/src/lib/libssl/src/crypto/bf/bf_ofb64.c
+++ b/src/lib/libssl/src/crypto/bf/bf_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bf_ofb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,11 +66,11 @@
 void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
              const BF_KEY *schedule, unsigned char *ivec, int *num)
         {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        BF_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         BF_LONG ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/bn/asm/x86_64-gcc.c b/src/lib/libssl/src/crypto/bn/asm/x86_64-gcc.c
index 5c12063dcf..c9a2b6be73 100644
--- a/src/lib/libssl/src/crypto/bn/asm/x86_64-gcc.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_add.c b/src/lib/libssl/src/crypto/bn/bn_add.c
index 5b2e2495b8..ebc9b9b56b 100644
--- a/src/lib/libssl/src/crypto/bn/bn_add.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_gf2m.c b/src/lib/libssl/src/crypto/bn/bn_gf2m.c
index d87f80d577..1cd38c7797 100644
--- a/src/lib/libssl/src/crypto/bn/bn_gf2m.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_lcl.h b/src/lib/libssl/src/crypto/bn/bn_lcl.h
index 2dab445a51..a76ba4149f 100644
--- a/src/lib/libssl/src/crypto/bn/bn_lcl.h
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_nist.c b/src/lib/libssl/src/crypto/bn/bn_nist.c
index 53ed559c06..693d6f1ed3 100644
--- a/src/lib/libssl/src/crypto/bn/bn_nist.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bn/bn_shift.c b/src/lib/libssl/src/crypto/bn/bn_shift.c
index 771ddff7b0..0e8211e3d6 100644
--- a/src/lib/libssl/src/crypto/bn/bn_shift.c
+++ b/src/lib/libssl/src/crypto/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);
diff --git a/src/lib/libssl/src/crypto/camellia/camellia.c b/src/lib/libssl/src/crypto/camellia/camellia.c
index f400bc9ff7..fa925b72a9 100644
--- a/src/lib/libssl/src/crypto/camellia/camellia.c
+++ b/src/lib/libssl/src/crypto/camellia/camellia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: camellia.c,v 1.7 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: camellia.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* ====================================================================
  * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
  * ALL RIGHTS RESERVED.
@@ -314,7 +314,7 @@ static const u32 SIGMA[] = {
  * specific] assembler version should be/is provided anyway...
  */
 #define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\
-        register u32 _t0,_t1,_t2,_t3;\
+        u32 _t0,_t1,_t2,_t3;\
 \
         _t0  = _s0 ^ (_key)[0];\
         _t3  = SBOX4_4404[_t0&0xff];\
@@ -348,7 +348,7 @@ static const u32 SIGMA[] = {
 
 int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
         {
-        register u32 s0,s1,s2,s3;
+        u32 s0,s1,s2,s3;
 
         k[0] = s0 = GETU32(rawKey);
         k[1] = s1 = GETU32(rawKey+4);
@@ -473,7 +473,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
 void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], 
                 const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
         {
-        register u32 s0,s1,s2,s3; 
+        u32 s0,s1,s2,s3; 
         const u32 *k = keyTable,*kend = keyTable+grandRounds*16; 
 
         s0 = GETU32(plaintext)    ^ k[0];
diff --git a/src/lib/libssl/src/crypto/cast/c_cfb64.c b/src/lib/libssl/src/crypto/cast/c_cfb64.c
index 77a02d6dd8..726d19e005 100644
--- a/src/lib/libssl/src/crypto/cast/c_cfb64.c
+++ b/src/lib/libssl/src/crypto/cast/c_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_cfb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, const CAST_KEY *schedule, unsigned char *ivec,
                         int *num, int enc)
         {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        CAST_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         CAST_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/cast/c_enc.c b/src/lib/libssl/src/crypto/cast/c_enc.c
index 4305c3108c..5999a59031 100644
--- a/src/lib/libssl/src/crypto/cast/c_enc.c
+++ b/src/lib/libssl/src/crypto/cast/c_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,8 +62,8 @@
 #ifndef OPENBSD_CAST_ASM
 void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
         {
-        register CAST_LONG l,r,t;
-        register const CAST_LONG *k;
+        CAST_LONG l,r,t;
+        const CAST_LONG *k;
 
         k= &(key->data[0]);
         l=data[0];
@@ -95,8 +95,8 @@ void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
 
 void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
         {
-        register CAST_LONG l,r,t;
-        register const CAST_LONG *k;
+        CAST_LONG l,r,t;
+        const CAST_LONG *k;
 
         k= &(key->data[0]);
         l=data[0];
@@ -130,9 +130,9 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
 void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              const CAST_KEY *ks, unsigned char *iv, int enc)
         {
-        register CAST_LONG tin0,tin1;
-        register CAST_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        CAST_LONG tin0,tin1;
+        CAST_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         CAST_LONG tin[2];
 
         if (enc)
diff --git a/src/lib/libssl/src/crypto/cast/c_ofb64.c b/src/lib/libssl/src/crypto/cast/c_ofb64.c
index dc5eebf56b..611425a668 100644
--- a/src/lib/libssl/src/crypto/cast/c_ofb64.c
+++ b/src/lib/libssl/src/crypto/cast/c_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: c_ofb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, const CAST_KEY *schedule, unsigned char *ivec,
                         int *num)
         {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        CAST_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         CAST_LONG ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/des/cbc_cksm.c b/src/lib/libssl/src/crypto/des/cbc_cksm.c
index c1fc81af57..20553ef09f 100644
--- a/src/lib/libssl/src/crypto/des/cbc_cksm.c
+++ b/src/lib/libssl/src/crypto/des/cbc_cksm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbc_cksm.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cbc_cksm.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,8 +62,8 @@ DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
                        long length, DES_key_schedule *schedule,
                        const_DES_cblock *ivec)
         {
-        register DES_LONG tout0,tout1,tin0,tin1;
-        register long l=length;
+        DES_LONG tout0,tout1,tin0,tin1;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *out = &(*output)[0];
         const unsigned char *iv = &(*ivec)[0];
diff --git a/src/lib/libssl/src/crypto/des/cfb64ede.c b/src/lib/libssl/src/crypto/des/cfb64ede.c
index 62f4ae2ac2..0b5c7d6249 100644
--- a/src/lib/libssl/src/crypto/des/cfb64ede.c
+++ b/src/lib/libssl/src/crypto/des/cfb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb64ede.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cfb64ede.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                             DES_key_schedule *ks2, DES_key_schedule *ks3,
                             DES_cblock *ivec, int *num, int enc)
         {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
+        DES_LONG v0,v1;
+        long l=length;
+        int n= *num;
         DES_LONG ti[2];
         unsigned char *iv,c,cc;
 
@@ -150,9 +150,9 @@ void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out,
                           DES_key_schedule *ks2,DES_key_schedule *ks3,
                           DES_cblock *ivec,int enc)
         {
-        register DES_LONG d0,d1,v0,v1;
-        register unsigned long l=length,n=((unsigned int)numbits+7)/8;
-        register int num=numbits,i;
+        DES_LONG d0,d1,v0,v1;
+        unsigned long l=length,n=((unsigned int)numbits+7)/8;
+        int num=numbits,i;
         DES_LONG ti[2];
         unsigned char *iv;
         unsigned char ovec[16];
diff --git a/src/lib/libssl/src/crypto/des/cfb64enc.c b/src/lib/libssl/src/crypto/des/cfb64enc.c
index 86d626beb3..6c8f99e841 100644
--- a/src/lib/libssl/src/crypto/des/cfb64enc.c
+++ b/src/lib/libssl/src/crypto/des/cfb64enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb64enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cfb64enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,9 +67,9 @@ void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, DES_key_schedule *schedule,
                        DES_cblock *ivec, int *num, int enc)
         {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
+        DES_LONG v0,v1;
+        long l=length;
+        int n= *num;
         DES_LONG ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/des/cfb_enc.c b/src/lib/libssl/src/crypto/des/cfb_enc.c
index b8c510067c..d654a6a8e2 100644
--- a/src/lib/libssl/src/crypto/des/cfb_enc.c
+++ b/src/lib/libssl/src/crypto/des/cfb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb_enc.c,v 1.11 2014/07/09 16:06:13 miod Exp $ */
+/* $OpenBSD: cfb_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -72,9 +72,9 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                      long length, DES_key_schedule *schedule, DES_cblock *ivec,
                      int enc)
         {
-        register DES_LONG d0,d1,v0,v1;
-        register unsigned long l=length;
-        register int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
+        DES_LONG d0,d1,v0,v1;
+        unsigned long l=length;
+        int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
         DES_LONG ti[2];
         unsigned char *iv;
 #if BYTE_ORDER != LITTLE_ENDIAN
diff --git a/src/lib/libssl/src/crypto/des/des_enc.c b/src/lib/libssl/src/crypto/des/des_enc.c
index 9f14cc96e4..1de35e1e34 100644
--- a/src/lib/libssl/src/crypto/des/des_enc.c
+++ b/src/lib/libssl/src/crypto/des/des_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_enc.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: des_enc.c,v 1.12 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,14 +63,14 @@
 
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
 #ifndef DES_UNROLL
-        register int i;
+        int i;
 #endif
-        register DES_LONG *s;
+        DES_LONG *s;
 
         r=data[0];
         l=data[1];
@@ -157,14 +157,14 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
 
 void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
 #ifndef DES_UNROLL
-        register int i;
+        int i;
 #endif
-        register DES_LONG *s;
+        DES_LONG *s;
 
         r=data[0];
         l=data[1];
@@ -247,7 +247,7 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
                   DES_key_schedule *ks2, DES_key_schedule *ks3)
         {
-        register DES_LONG l,r;
+        DES_LONG l,r;
 
         l=data[0];
         r=data[1];
@@ -267,7 +267,7 @@ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
 void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
                   DES_key_schedule *ks2, DES_key_schedule *ks3)
         {
-        register DES_LONG l,r;
+        DES_LONG l,r;
 
         l=data[0];
         r=data[1];
@@ -294,11 +294,11 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
                           DES_key_schedule *ks2, DES_key_schedule *ks3,
                           DES_cblock *ivec, int enc)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register const unsigned char *in;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        const unsigned char *in;
         unsigned char *out;
-        register long l=length;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
@@ -347,7 +347,7 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
                 }
         else
                 {
-                register DES_LONG t0,t1;
+                DES_LONG t0,t1;
 
                 c2l(iv,xor0);
                 c2l(iv,xor1);
diff --git a/src/lib/libssl/src/crypto/des/des_locl.h b/src/lib/libssl/src/crypto/des/des_locl.h
index 9480d37489..38ac68a6e6 100644
--- a/src/lib/libssl/src/crypto/des/des_locl.h
+++ b/src/lib/libssl/src/crypto/des/des_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_locl.h,v 1.17 2014/08/18 19:15:34 bcook Exp $ */
+/* $OpenBSD: des_locl.h,v 1.18 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -363,7 +363,7 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
 
 #define IP(l,r) \
         { \
-        register DES_LONG tt; \
+        DES_LONG tt; \
         PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
         PERM_OP(l,r,tt,16,0x0000ffffL); \
         PERM_OP(r,l,tt, 2,0x33333333L); \
@@ -373,7 +373,7 @@ static inline uint32_t ROTATE(uint32_t a, uint32_t n)
 
 #define FP(l,r) \
         { \
-        register DES_LONG tt; \
+        DES_LONG tt; \
         PERM_OP(l,r,tt, 1,0x55555555L); \
         PERM_OP(r,l,tt, 8,0x00ff00ffL); \
         PERM_OP(l,r,tt, 2,0x33333333L); \
diff --git a/src/lib/libssl/src/crypto/des/ecb3_enc.c b/src/lib/libssl/src/crypto/des/ecb3_enc.c
index 394b71b4b1..97de804cfb 100644
--- a/src/lib/libssl/src/crypto/des/ecb3_enc.c
+++ b/src/lib/libssl/src/crypto/des/ecb3_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecb3_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ecb3_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,7 +63,7 @@ void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
                       DES_key_schedule *ks3,
              int enc)
         {
-        register DES_LONG l0,l1;
+        DES_LONG l0,l1;
         DES_LONG ll[2];
         const unsigned char *in = &(*input)[0];
         unsigned char *out = &(*output)[0];
diff --git a/src/lib/libssl/src/crypto/des/ecb_enc.c b/src/lib/libssl/src/crypto/des/ecb_enc.c
index 8eaf3e9582..dac37de882 100644
--- a/src/lib/libssl/src/crypto/des/ecb_enc.c
+++ b/src/lib/libssl/src/crypto/des/ecb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecb_enc.c,v 1.15 2014/07/09 11:10:50 bcook Exp $ */
+/* $OpenBSD: ecb_enc.c,v 1.16 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -104,7 +104,7 @@ const char *DES_options(void)
 void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
                      DES_key_schedule *ks, int enc)
         {
-        register DES_LONG l;
+        DES_LONG l;
         DES_LONG ll[2];
         const unsigned char *in = &(*input)[0];
         unsigned char *out = &(*output)[0];
diff --git a/src/lib/libssl/src/crypto/des/ede_cbcm_enc.c b/src/lib/libssl/src/crypto/des/ede_cbcm_enc.c
index 8fc6e1abf6..9a9f51e311 100644
--- a/src/lib/libssl/src/crypto/des/ede_cbcm_enc.c
+++ b/src/lib/libssl/src/crypto/des/ede_cbcm_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ede_cbcm_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ede_cbcm_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Written by Ben Laurie <ben@algroup.co.uk> for the OpenSSL
  * project 13 Feb 1999.
  */
@@ -78,9 +78,9 @@ void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
              DES_key_schedule *ks3, DES_cblock *ivec1, DES_cblock *ivec2,
              int enc)
     {
-    register DES_LONG tin0,tin1;
-    register DES_LONG tout0,tout1,xor0,xor1,m0,m1;
-    register long l=length;
+    DES_LONG tin0,tin1;
+    DES_LONG tout0,tout1,xor0,xor1,m0,m1;
+    long l=length;
     DES_LONG tin[2];
     unsigned char *iv1,*iv2;
 
@@ -138,7 +138,7 @@ void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
         }
     else
         {
-        register DES_LONG t0,t1;
+        DES_LONG t0,t1;
 
         c2l(iv1,m0);
         c2l(iv1,m1);
diff --git a/src/lib/libssl/src/crypto/des/fcrypt_b.c b/src/lib/libssl/src/crypto/des/fcrypt_b.c
index 27a1617845..ad11a47d88 100644
--- a/src/lib/libssl/src/crypto/des/fcrypt_b.c
+++ b/src/lib/libssl/src/crypto/des/fcrypt_b.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fcrypt_b.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: fcrypt_b.c,v 1.9 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,13 +82,13 @@
 void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
                  DES_LONG Eswap1)
         {
-        register DES_LONG l,r,t,u;
+        DES_LONG l,r,t,u;
 #ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
+        const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
-        register DES_LONG *s;
-        register int j;
-        register DES_LONG E0,E1;
+        DES_LONG *s;
+        int j;
+        DES_LONG E0,E1;
 
         l=0;
         r=0;
@@ -100,7 +100,7 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
         for (j=0; j<25; j++)
                 {
 #ifndef DES_UNROLL
-                register int i;
+                int i;
 
                 for (i=0; i<32; i+=4)
                         {
diff --git a/src/lib/libssl/src/crypto/des/ncbc_enc.c b/src/lib/libssl/src/crypto/des/ncbc_enc.c
index 0c5b234948..212796237d 100644
--- a/src/lib/libssl/src/crypto/des/ncbc_enc.c
+++ b/src/lib/libssl/src/crypto/des/ncbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncbc_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ncbc_enc.c,v 1.7 2014/10/28 07:35:58 jsg Exp $ */
 /*
  * #included by:
  *    cbc_enc.c  (DES_cbc_encrypt)
@@ -71,9 +71,9 @@ void DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                      DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
 #endif
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
diff --git a/src/lib/libssl/src/crypto/des/ofb64ede.c b/src/lib/libssl/src/crypto/des/ofb64ede.c
index 77bb4a5ef1..1d916e9305 100644
--- a/src/lib/libssl/src/crypto/des/ofb64ede.c
+++ b/src/lib/libssl/src/crypto/des/ofb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb64ede.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb64ede.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,17 +62,17 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void DES_ede3_ofb64_encrypt(register const unsigned char *in,
-                            register unsigned char *out, long length,
+void DES_ede3_ofb64_encrypt(const unsigned char *in,
+                            unsigned char *out, long length,
                             DES_key_schedule *k1, DES_key_schedule *k2,
                             DES_key_schedule *k3, DES_cblock *ivec,
                             int *num)
         {
-        register DES_LONG v0,v1;
-        register int n= *num;
-        register long l=length;
+        DES_LONG v0,v1;
+        int n= *num;
+        long l=length;
         DES_cblock d;
-        register char *dp;
+        char *dp;
         DES_LONG ti[2];
         unsigned char *iv;
         int save=0;
@@ -116,8 +116,8 @@ void DES_ede3_ofb64_encrypt(register const unsigned char *in,
         }
 
 #ifdef undef /* MACRO */
-void DES_ede2_ofb64_encrypt(register unsigned char *in,
-             register unsigned char *out, long length, DES_key_schedule k1,
+void DES_ede2_ofb64_encrypt(unsigned char *in,
+             unsigned char *out, long length, DES_key_schedule k1,
              DES_key_schedule k2, DES_cblock (*ivec), int *num)
         {
         DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
diff --git a/src/lib/libssl/src/crypto/des/ofb64enc.c b/src/lib/libssl/src/crypto/des/ofb64enc.c
index 2e547c29dd..de1a26b99f 100644
--- a/src/lib/libssl/src/crypto/des/ofb64enc.c
+++ b/src/lib/libssl/src/crypto/des/ofb64enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb64enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb64enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,15 +62,15 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void DES_ofb64_encrypt(register const unsigned char *in,
-                       register unsigned char *out, long length,
+void DES_ofb64_encrypt(const unsigned char *in,
+                       unsigned char *out, long length,
                        DES_key_schedule *schedule, DES_cblock *ivec, int *num)
         {
-        register DES_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        DES_LONG v0,v1,t;
+        int n= *num;
+        long l=length;
         DES_cblock d;
-        register unsigned char *dp;
+        unsigned char *dp;
         DES_LONG ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/des/ofb_enc.c b/src/lib/libssl/src/crypto/des/ofb_enc.c
index 7429f39a17..8cc5bbcb1e 100644
--- a/src/lib/libssl/src/crypto/des/ofb_enc.c
+++ b/src/lib/libssl/src/crypto/des/ofb_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: ofb_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,10 +68,10 @@ void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                      long length, DES_key_schedule *schedule,
                      DES_cblock *ivec)
         {
-        register DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8;
-        register DES_LONG mask0,mask1;
-        register long l=length;
-        register int num=numbits;
+        DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8;
+        DES_LONG mask0,mask1;
+        long l=length;
+        int num=numbits;
         DES_LONG ti[2];
         unsigned char *iv;
 
diff --git a/src/lib/libssl/src/crypto/des/pcbc_enc.c b/src/lib/libssl/src/crypto/des/pcbc_enc.c
index 3eeab022a4..fda18ba83d 100644
--- a/src/lib/libssl/src/crypto/des/pcbc_enc.c
+++ b/src/lib/libssl/src/crypto/des/pcbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcbc_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: pcbc_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,7 +62,7 @@ void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                       long length, DES_key_schedule *schedule,
                       DES_cblock *ivec, int enc)
         {
-        register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
+        DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
         DES_LONG tin[2];
         const unsigned char *in;
         unsigned char *out,*iv;
diff --git a/src/lib/libssl/src/crypto/des/set_key.c b/src/lib/libssl/src/crypto/des/set_key.c
index 1901ecd647..59d6893a80 100644
--- a/src/lib/libssl/src/crypto/des/set_key.c
+++ b/src/lib/libssl/src/crypto/des/set_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set_key.c,v 1.18 2014/10/12 20:48:58 miod Exp $ */
+/* $OpenBSD: set_key.c,v 1.19 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -334,10 +334,10 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
         {
         static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-        register DES_LONG c,d,t,s,t2;
-        register const unsigned char *in;
-        register DES_LONG *k;
-        register int i;
+        DES_LONG c,d,t,s,t2;
+        const unsigned char *in;
+        DES_LONG *k;
+        int i;
 
         k = &schedule->ks->deslong[0];
         in = &(*key)[0];
diff --git a/src/lib/libssl/src/crypto/des/str2key.c b/src/lib/libssl/src/crypto/des/str2key.c
index ffbfbafa93..8999eb292a 100644
--- a/src/lib/libssl/src/crypto/des/str2key.c
+++ b/src/lib/libssl/src/crypto/des/str2key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str2key.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: str2key.c,v 1.9 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,7 +63,7 @@ void DES_string_to_key(const char *str, DES_cblock *key)
         {
         DES_key_schedule ks;
         int i,length;
-        register unsigned char j;
+        unsigned char j;
 
         memset(key,0,8);
         length=strlen(str);
@@ -103,7 +103,7 @@ void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
         {
         DES_key_schedule ks;
         int i,length;
-        register unsigned char j;
+        unsigned char j;
 
         memset(key1,0,8);
         memset(key2,0,8);
diff --git a/src/lib/libssl/src/crypto/des/xcbc_enc.c b/src/lib/libssl/src/crypto/des/xcbc_enc.c
index 744021c255..dc4607e8aa 100644
--- a/src/lib/libssl/src/crypto/des/xcbc_enc.c
+++ b/src/lib/libssl/src/crypto/des/xcbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xcbc_enc.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: xcbc_enc.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -114,11 +114,11 @@ void DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                       DES_cblock *ivec, const_DES_cblock *inw,
                       const_DES_cblock *outw, int enc)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register DES_LONG inW0,inW1,outW0,outW1;
-        register const unsigned char *in2;
-        register long l=length;
+        DES_LONG tin0,tin1;
+        DES_LONG tout0,tout1,xor0,xor1;
+        DES_LONG inW0,inW1,outW0,outW1;
+        const unsigned char *in2;
+        long l=length;
         DES_LONG tin[2];
         unsigned char *iv;
 
diff --git a/src/lib/libssl/src/crypto/idea/i_cbc.c b/src/lib/libssl/src/crypto/idea/i_cbc.c
index 74f490d0c0..5bb9640c34 100644
--- a/src/lib/libssl/src/crypto/idea/i_cbc.c
+++ b/src/lib/libssl/src/crypto/idea/i_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_cbc.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_cbc.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
@@ -135,8 +135,8 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
 
 void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key)
         {
-        register IDEA_INT *p;
-        register unsigned long x1,x2,x3,x4,t0,t1,ul;
+        IDEA_INT *p;
+        unsigned long x1,x2,x3,x4,t0,t1,ul;
 
         x2=d[0];
         x1=(x2>>16);
diff --git a/src/lib/libssl/src/crypto/idea/i_cfb64.c b/src/lib/libssl/src/crypto/idea/i_cfb64.c
index 98fdd3ed00..b979aaef86 100644
--- a/src/lib/libssl/src/crypto/idea/i_cfb64.c
+++ b/src/lib/libssl/src/crypto/idea/i_cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_cfb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_cfb64.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, IDEA_KEY_SCHEDULE *schedule,
                         unsigned char *ivec, int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/idea/i_ofb64.c b/src/lib/libssl/src/crypto/idea/i_ofb64.c
index cfef8ea95f..376dad9f6d 100644
--- a/src/lib/libssl/src/crypto/idea/i_ofb64.c
+++ b/src/lib/libssl/src/crypto/idea/i_ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_ofb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_ofb64.c,v 1.3 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                         long length, IDEA_KEY_SCHEDULE *schedule,
                         unsigned char *ivec, int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/idea/i_skey.c b/src/lib/libssl/src/crypto/idea/i_skey.c
index 8af1874598..2824d2618e 100644
--- a/src/lib/libssl/src/crypto/idea/i_skey.c
+++ b/src/lib/libssl/src/crypto/idea/i_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i_skey.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: i_skey.c,v 1.4 2014/10/28 07:35:58 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,7 +64,7 @@ static IDEA_INT inverse(unsigned int xin);
 void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
         {
         int i;
-        register IDEA_INT *kt,*kf,r0,r1,r2;
+        IDEA_INT *kt,*kf,r0,r1,r2;
 
         kt= &(ks->data[0][0]);
         n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]);
@@ -98,7 +98,7 @@ void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
 void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
         {
         int r;
-        register IDEA_INT *fp,*tp,t;
+        IDEA_INT *fp,*tp,t;
 
         tp= &(dk->data[0][0]);
         fp= &(ek->data[8][0]);
diff --git a/src/lib/libssl/src/crypto/md4/md4_dgst.c b/src/lib/libssl/src/crypto/md4/md4_dgst.c
index 22bb32c41b..d4a0c6ff06 100644
--- a/src/lib/libssl/src/crypto/md4/md4_dgst.c
+++ b/src/lib/libssl/src/crypto/md4/md4_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md4_dgst.c,v 1.13 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: md4_dgst.c,v 1.14 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int MD4_Init(MD4_CTX *c)
 void md4_block_data_order (MD4_CTX *c, const void *data_, size_t num)
         {
         const unsigned char *data=data_;
-        register unsigned MD32_REG_T A,B,C,D,l;
+        unsigned MD32_REG_T A,B,C,D,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
diff --git a/src/lib/libssl/src/crypto/md5/md5_dgst.c b/src/lib/libssl/src/crypto/md5/md5_dgst.c
index 6f2a2abceb..f55113727a 100644
--- a/src/lib/libssl/src/crypto/md5/md5_dgst.c
+++ b/src/lib/libssl/src/crypto/md5/md5_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5_dgst.c,v 1.13 2014/07/09 11:10:51 bcook Exp $ */
+/* $OpenBSD: md5_dgst.c,v 1.14 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int MD5_Init(MD5_CTX *c)
 void md5_block_data_order (MD5_CTX *c, const void *data_, size_t num)
         {
         const unsigned char *data=data_;
-        register unsigned MD32_REG_T A,B,C,D,l;
+        unsigned MD32_REG_T A,B,C,D,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
diff --git a/src/lib/libssl/src/crypto/mdc2/mdc2dgst.c b/src/lib/libssl/src/crypto/mdc2/mdc2dgst.c
index 6b29e04072..b4b0068d59 100644
--- a/src/lib/libssl/src/crypto/mdc2/mdc2dgst.c
+++ b/src/lib/libssl/src/crypto/mdc2/mdc2dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdc2dgst.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: mdc2dgst.c,v 1.7 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,8 +123,8 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len)
 
 static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len)
         {
-        register DES_LONG tin0,tin1;
-        register DES_LONG ttin0,ttin1;
+        DES_LONG tin0,tin1;
+        DES_LONG ttin0,ttin1;
         DES_LONG d[2],dd[2];
         DES_key_schedule k;
         unsigned char *p;
diff --git a/src/lib/libssl/src/crypto/rc2/rc2_cbc.c b/src/lib/libssl/src/crypto/rc2/rc2_cbc.c
index 7d826e32e1..a947f1d3c3 100644
--- a/src/lib/libssl/src/crypto/rc2/rc2_cbc.c
+++ b/src/lib/libssl/src/crypto/rc2/rc2_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2_cbc.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2_cbc.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,9 +62,9 @@
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
              RC2_KEY *ks, unsigned char *iv, int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
@@ -136,8 +136,8 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
 void RC2_encrypt(unsigned long *d, RC2_KEY *key)
         {
         int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
+        RC2_INT *p0,*p1;
+        RC2_INT x0,x1,x2,x3,t;
         unsigned long l;
 
         l=d[0];
@@ -181,8 +181,8 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
 void RC2_decrypt(unsigned long *d, RC2_KEY *key)
         {
         int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
+        RC2_INT *p0,*p1;
+        RC2_INT x0,x1,x2,x3,t;
         unsigned long l;
 
         l=d[0];
diff --git a/src/lib/libssl/src/crypto/rc2/rc2cfb64.c b/src/lib/libssl/src/crypto/rc2/rc2cfb64.c
index 3da6a96457..95366444c4 100644
--- a/src/lib/libssl/src/crypto/rc2/rc2cfb64.c
+++ b/src/lib/libssl/src/crypto/rc2/rc2cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2cfb64.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2cfb64.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, RC2_KEY *schedule, unsigned char *ivec,
                        int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/rc2/rc2ofb64.c b/src/lib/libssl/src/crypto/rc2/rc2ofb64.c
index 58c765d456..c47b413739 100644
--- a/src/lib/libssl/src/crypto/rc2/rc2ofb64.c
+++ b/src/lib/libssl/src/crypto/rc2/rc2ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc2ofb64.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc2ofb64.c,v 1.5 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, RC2_KEY *schedule, unsigned char *ivec,
                        int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/rc4/rc4_enc.c b/src/lib/libssl/src/crypto/rc4/rc4_enc.c
index 79051b3e2a..e68edddfea 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4_enc.c
+++ b/src/lib/libssl/src/crypto/rc4/rc4_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_enc.c,v 1.12 2014/07/09 16:06:13 miod Exp $ */
+/* $OpenBSD: rc4_enc.c,v 1.13 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,8 +71,8 @@
 void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
              unsigned char *outdata)
         {
-        register RC4_INT *d;
-        register RC4_INT x,y,tx,ty;
+        RC4_INT *d;
+        RC4_INT x,y,tx,ty;
         size_t i;
         
         x=key->x;     
diff --git a/src/lib/libssl/src/crypto/rc4/rc4_skey.c b/src/lib/libssl/src/crypto/rc4/rc4_skey.c
index 455cd44d13..7ef4da3f15 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4_skey.c
+++ b/src/lib/libssl/src/crypto/rc4/rc4_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc4_skey.c,v 1.12 2014/07/12 20:11:45 miod Exp $ */
+/* $OpenBSD: rc4_skey.c,v 1.13 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -85,9 +85,9 @@ const char *RC4_options(void)
 
 void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
         {
-        register RC4_INT tmp;
-        register int id1,id2;
-        register RC4_INT *d;
+        RC4_INT tmp;
+        int id1,id2;
+        RC4_INT *d;
         unsigned int i;
         
         d= &(key->data[0]);
diff --git a/src/lib/libssl/src/crypto/rc5/rc5_enc.c b/src/lib/libssl/src/crypto/rc5/rc5_enc.c
index 8fdbabe8b6..3828fe29c5 100644
--- a/src/lib/libssl/src/crypto/rc5/rc5_enc.c
+++ b/src/lib/libssl/src/crypto/rc5/rc5_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5_enc.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5_enc.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,9 +64,9 @@ void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
                         long length, RC5_32_KEY *ks, unsigned char *iv,
                         int encrypt)
         {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
+        unsigned long tin0,tin1;
+        unsigned long tout0,tout1,xor0,xor1;
+        long l=length;
         unsigned long tin[2];
 
         if (encrypt)
diff --git a/src/lib/libssl/src/crypto/rc5/rc5cfb64.c b/src/lib/libssl/src/crypto/rc5/rc5cfb64.c
index eebf828e65..0f4d11248c 100644
--- a/src/lib/libssl/src/crypto/rc5/rc5cfb64.c
+++ b/src/lib/libssl/src/crypto/rc5/rc5cfb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5cfb64.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5cfb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,9 +68,9 @@ void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num, int encrypt)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned long ti[2];
         unsigned char *iv,c,cc;
 
diff --git a/src/lib/libssl/src/crypto/rc5/rc5ofb64.c b/src/lib/libssl/src/crypto/rc5/rc5ofb64.c
index b823aeb148..0a8686092b 100644
--- a/src/lib/libssl/src/crypto/rc5/rc5ofb64.c
+++ b/src/lib/libssl/src/crypto/rc5/rc5ofb64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc5ofb64.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rc5ofb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,11 +67,11 @@ void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
                           long length, RC5_32_KEY *schedule,
                           unsigned char *ivec, int *num)
         {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
+        unsigned long v0,v1,t;
+        int n= *num;
+        long l=length;
         unsigned char d[8];
-        register char *dp;
+        char *dp;
         unsigned long ti[2];
         unsigned char *iv;
         int save=0;
diff --git a/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c b/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
index f26fc31bf3..458968d4a6 100644
--- a/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
+++ b/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmd_dgst.c,v 1.16 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: rmd_dgst.c,v 1.17 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ int RIPEMD160_Init(RIPEMD160_CTX *c)
 void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E;
+        unsigned MD32_REG_T A,B,C,D,E;
         unsigned MD32_REG_T a,b,c,d,e,l;
 #ifndef MD32_XARRAY
         /* See comment in crypto/sha/sha_locl.h for details. */
diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h
index f92d9c4181..f2f9a31ee7 100644
--- a/src/lib/libssl/src/crypto/sha/sha_locl.h
+++ b/src/lib/libssl/src/crypto/sha/sha_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sha_locl.h,v 1.18 2014/08/18 19:11:48 bcook Exp $ */
+/* $OpenBSD: sha_locl.h,v 1.19 2014/10/28 07:35:59 jsg Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -206,7 +206,7 @@ int SHA1_Init(SHA_CTX *c)
 static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E,T,l;
+        unsigned MD32_REG_T A,B,C,D,E,T,l;
 #ifndef MD32_XARRAY
         unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
                                 XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
@@ -391,7 +391,7 @@ static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
 static void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
         {
         const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E,T,l;
+        unsigned MD32_REG_T A,B,C,D,E,T,l;
         int i;
         SHA_LONG        X[16];