diff options
author | jsing <> | 2014-05-08 15:13:06 +0000 |
---|---|---|
committer | jsing <> | 2014-05-08 15:13:06 +0000 |
commit | 9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb (patch) | |
tree | ef972fdbbb4716d3000038e30dffd3367e980018 /src/lib/libcrypto/evp/e_cast.c | |
parent | ff8febcf7ff5708902485e389dc8f34d77f0a932 (diff) | |
download | openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.tar.gz openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.tar.bz2 openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.zip |
KNF.
Diffstat (limited to 'src/lib/libcrypto/evp/e_cast.c')
-rw-r--r-- | src/lib/libcrypto/evp/e_cast.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/lib/libcrypto/evp/e_cast.c b/src/lib/libcrypto/evp/e_cast.c index d77bcd9298..199c5bf48e 100644 --- a/src/lib/libcrypto/evp/e_cast.c +++ b/src/lib/libcrypto/evp/e_cast.c | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -66,25 +66,24 @@ | |||
66 | #include <openssl/cast.h> | 66 | #include <openssl/cast.h> |
67 | 67 | ||
68 | static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 68 | static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
69 | const unsigned char *iv,int enc); | 69 | const unsigned char *iv, int enc); |
70 | 70 | ||
71 | typedef struct | 71 | typedef struct { |
72 | { | ||
73 | CAST_KEY ks; | 72 | CAST_KEY ks; |
74 | } EVP_CAST_KEY; | 73 | } EVP_CAST_KEY; |
75 | 74 | ||
76 | #define data(ctx) EVP_C_DATA(EVP_CAST_KEY,ctx) | 75 | #define data(ctx) EVP_C_DATA(EVP_CAST_KEY,ctx) |
77 | 76 | ||
78 | IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY, | 77 | IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY, |
79 | NID_cast5, 8, CAST_KEY_LENGTH, 8, 64, | 78 | NID_cast5, 8, CAST_KEY_LENGTH, 8, 64, |
80 | EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL, | 79 | EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL, |
81 | EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL) | 80 | EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL) |
82 | |||
83 | static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
84 | const unsigned char *iv, int enc) | ||
85 | { | ||
86 | CAST_set_key(&data(ctx)->ks,EVP_CIPHER_CTX_key_length(ctx),key); | ||
87 | return 1; | ||
88 | } | ||
89 | 81 | ||
82 | static int | ||
83 | cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
84 | const unsigned char *iv, int enc) | ||
85 | { | ||
86 | CAST_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), key); | ||
87 | return 1; | ||
88 | } | ||
90 | #endif | 89 | #endif |