summaryrefslogtreecommitdiff
path: root/crypto/des
diff options
context:
space:
mode:
authorKaoruToda <kunnpuu@gmail.com>2017-10-09 20:05:58 +0900
committerMatt Caswell <matt@openssl.org>2017-10-09 13:17:09 +0100
commit208fb891e36f16d20262710c70ef0ff3df0e885c (patch)
tree514e6161c7c21122fced736efaddd87f5b5e0538 /crypto/des
parent2e8b5d75afaff7c9b75917b750f997dc82336fac (diff)
downloadopenssl-new-208fb891e36f16d20262710c70ef0ff3df0e885c.tar.gz
Since return is inconsistent, I removed unnecessary parentheses and
unified them. - return (0); -> return 0; - return (1); -> return 1; - return (-1); -> return -1; Reviewed-by: Stephen Henson <steve@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4500)
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/rand_key.c2
-rw-r--r--crypto/des/set_key.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/des/rand_key.c b/crypto/des/rand_key.c
index 61e4f9d05d..3921aaf005 100644
--- a/crypto/des/rand_key.c
+++ b/crypto/des/rand_key.c
@@ -17,5 +17,5 @@ int DES_random_key(DES_cblock *ret)
return (0);
} while (DES_is_weak_key(ret));
DES_set_odd_parity(ret);
- return (1);
+ return 1;
}
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index cd3ec67ecb..91b83ee3fe 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -67,7 +67,7 @@ int DES_check_key_parity(const_DES_cblock *key)
if ((*key)[i] != odd_parity[(*key)[i]])
return (0);
}
- return (1);
+ return 1;
}
/*-
@@ -114,7 +114,7 @@ int DES_is_weak_key(const_DES_cblock *key)
* 97/03/18
*/
if (memcmp(weak_keys[i], key, sizeof(DES_cblock)) == 0)
- return (1);
+ return 1;
return (0);
}