From a0b4b08aa4811ef730e76a9ffc401a5293770f92 Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Tue, 28 Oct 2014 07:35:59 +0000
Subject: deregister; no binary change ok jsing@ miod@

---
 src/lib/libcrypto/bf/bf_cbc.c   |  8 ++++----
 src/lib/libcrypto/bf/bf_cfb64.c |  8 ++++----
 src/lib/libcrypto/bf/bf_enc.c   | 20 ++++++++++----------
 src/lib/libcrypto/bf/bf_ofb64.c | 10 +++++-----
 4 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/lib/libcrypto/bf')

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;
-- 
cgit v1.2.3-55-g6feb