diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-08 15:13:07 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-08 15:13:07 +0000 |
commit | 046b1619e2c2efcc9f8e62074494a582190f5e8e (patch) | |
tree | 757871e86a0dbd919c0ed592ddc3929fc14f6283 /lib/libcrypto/evp/e_rc4.c | |
parent | 8b2604de84bba9c9b10bb2dd180a284891da846b (diff) |
KNF.
Diffstat (limited to 'lib/libcrypto/evp/e_rc4.c')
-rw-r--r-- | lib/libcrypto/evp/e_rc4.c | 79 |
1 files changed, 40 insertions, 39 deletions
diff --git a/lib/libcrypto/evp/e_rc4.c b/lib/libcrypto/evp/e_rc4.c index b4f6bda82d4..f66885f70d3 100644 --- a/lib/libcrypto/evp/e_rc4.c +++ b/lib/libcrypto/evp/e_rc4.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -69,21 +69,20 @@ /* FIXME: surely this is available elsewhere? */ #define EVP_RC4_KEY_SIZE 16 -typedef struct - { +typedef struct { RC4_KEY ks; /* working key */ - } EVP_RC4_KEY; +} EVP_RC4_KEY; #define data(ctx) ((EVP_RC4_KEY *)(ctx)->cipher_data) static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv,int enc); + const unsigned char *iv, int enc); static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl); -static const EVP_CIPHER r4_cipher= - { + const unsigned char *in, size_t inl); + +static const EVP_CIPHER r4_cipher = { NID_rc4, - 1,EVP_RC4_KEY_SIZE,0, + 1, EVP_RC4_KEY_SIZE, 0, EVP_CIPH_VARIABLE_LENGTH, rc4_init_key, rc4_cipher, @@ -93,45 +92,47 @@ static const EVP_CIPHER r4_cipher= NULL, NULL, NULL - }; +}; -static const EVP_CIPHER r4_40_cipher= - { +static const EVP_CIPHER r4_40_cipher = { NID_rc4_40, - 1,5 /* 40 bit */,0, + 1, 5 /* 40 bit */, 0, EVP_CIPH_VARIABLE_LENGTH, rc4_init_key, rc4_cipher, NULL, sizeof(EVP_RC4_KEY), - NULL, + NULL, NULL, NULL, NULL - }; +}; -const EVP_CIPHER *EVP_rc4(void) - { - return(&r4_cipher); - } +const EVP_CIPHER * +EVP_rc4(void) +{ + return (&r4_cipher); +} -const EVP_CIPHER *EVP_rc4_40(void) - { - return(&r4_40_cipher); - } +const EVP_CIPHER * +EVP_rc4_40(void) +{ + return (&r4_40_cipher); +} -static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - RC4_set_key(&data(ctx)->ks,EVP_CIPHER_CTX_key_length(ctx), - key); +static int +rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, + const unsigned char *iv, int enc) +{ + RC4_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), key); return 1; - } +} -static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) - { - RC4(&data(ctx)->ks,inl,in,out); +static int +rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + const unsigned char *in, size_t inl) +{ + RC4(&data(ctx)->ks, inl, in, out); return 1; - } +} #endif |