diff options
| author | jsing <> | 2016-09-04 14:31:29 +0000 |
|---|---|---|
| committer | jsing <> | 2016-09-04 14:31:29 +0000 |
| commit | d613aa0d6ef93fa8587113d3e866da6c582bdd0d (patch) | |
| tree | 492fd2a4355d8592de425463d194374bdc85aa0a /src/lib/libcrypto/camellia | |
| parent | 1fa74209c13c3c35efb162ffffa41dac313d3fc5 (diff) | |
| download | openbsd-d613aa0d6ef93fa8587113d3e866da6c582bdd0d.tar.gz openbsd-d613aa0d6ef93fa8587113d3e866da6c582bdd0d.tar.bz2 openbsd-d613aa0d6ef93fa8587113d3e866da6c582bdd0d.zip | |
Less S390.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/camellia')
| -rw-r--r-- | src/lib/libcrypto/camellia/camellia.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c index cb577798a8..5f754ff78b 100644 --- a/src/lib/libcrypto/camellia/camellia.c +++ b/src/lib/libcrypto/camellia/camellia.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: camellia.c,v 1.10 2014/11/19 11:37:52 bcook Exp $ */ | 1 | /* $OpenBSD: camellia.c,v 1.11 2016/09/04 14:31:29 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . | 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . |
| 4 | * ALL RIGHTS RESERVED. | 4 | * ALL RIGHTS RESERVED. |
| @@ -101,11 +101,6 @@ | |||
| 101 | defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__) | 101 | defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__) |
| 102 | # define LeftRotate(x,s) ({u32 ret; asm ("rlwinm %0,%1,%2,0,31":"=r"(ret):"r"(x),"I"(s)); ret; }) | 102 | # define LeftRotate(x,s) ({u32 ret; asm ("rlwinm %0,%1,%2,0,31":"=r"(ret):"r"(x),"I"(s)); ret; }) |
| 103 | # define RightRotate(x,s) LeftRotate(x,(32-s)) | 103 | # define RightRotate(x,s) LeftRotate(x,(32-s)) |
| 104 | # elif defined(__s390x__) | ||
| 105 | # define LeftRotate(x,s) ({u32 ret; asm ("rll %0,%1,%2":"=r"(ret):"r"(x),"I"(s)); ret; }) | ||
| 106 | # define RightRotate(x,s) LeftRotate(x,(32-s)) | ||
| 107 | # define GETU32(p) (*(u32 *)(p)) | ||
| 108 | # define PUTU32(p,v) (*(u32 *)(p)=(v)) | ||
| 109 | # endif | 104 | # endif |
| 110 | # endif | 105 | # endif |
| 111 | #endif | 106 | #endif |
