diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/des/rpc_des.h | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/des/rpc_des.h')
| -rw-r--r-- | src/lib/libcrypto/des/rpc_des.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/rpc_des.h b/src/lib/libcrypto/des/rpc_des.h index efc474f00e..8263c512ab 100644 --- a/src/lib/libcrypto/des/rpc_des.h +++ b/src/lib/libcrypto/des/rpc_des.h | |||
| @@ -124,10 +124,10 @@ struct desparams { | |||
| 124 | /* | 124 | /* |
| 125 | * Encrypt an arbitrary sized buffer | 125 | * Encrypt an arbitrary sized buffer |
| 126 | */ | 126 | */ |
| 127 | #define DESIOCBLOCK _IOWR(d, 6, struct desparams) | 127 | #define DESIOCBLOCK _IOWR('d', 6, struct desparams) |
| 128 | 128 | ||
| 129 | /* | 129 | /* |
| 130 | * Encrypt of small amount of data, quickly | 130 | * Encrypt of small amount of data, quickly |
| 131 | */ | 131 | */ |
| 132 | #define DESIOCQUICK _IOWR(d, 7, struct desparams) | 132 | #define DESIOCQUICK _IOWR('d', 7, struct desparams) |
| 133 | 133 | ||