From 0505bd63c15c82aead21cde52afbf6c41421d140 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/idea/i_cbc.c   | 12 ++++++------
 src/lib/libcrypto/idea/i_cfb64.c |  8 ++++----
 src/lib/libcrypto/idea/i_ofb64.c | 10 +++++-----
 src/lib/libcrypto/idea/i_skey.c  |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

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

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