18 files changed, 94 insertions, 94 deletions

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;