From c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:43:31 +0100 Subject: Upgraded to openssl-1.0.2 --- openssl/bugs/stream.c | 119 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 59 deletions(-) (limited to 'openssl/bugs/stream.c') diff --git a/openssl/bugs/stream.c b/openssl/bugs/stream.c index c3b5e867d..9af239553 100644 --- a/openssl/bugs/stream.c +++ b/openssl/bugs/stream.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 @@ -59,73 +59,74 @@ #include #include #ifdef OPENSSL_NO_DES -#include +# include #else -#include +# include #endif -/* show how stream ciphers are not very good. The mac has no affect - * on RC4 while it does for cfb DES +/* + * show how stream ciphers are not very good. The mac has no affect on RC4 + * while it does for cfb DES */ main() - { - fprintf(stderr,"rc4\n"); - rc4(); - fprintf(stderr,"cfb des\n"); - des(); - } +{ + fprintf(stderr, "rc4\n"); + rc4(); + fprintf(stderr, "cfb des\n"); + des(); +} int des() - { - des_key_schedule ks; - des_cblock iv,key; - int num; - static char *keystr="01234567"; - static char *in1="0123456789ABCEDFdata 12345"; - static char *in2="9876543210abcdefdata 12345"; - unsigned char out[100]; - int i; +{ + des_key_schedule ks; + des_cblock iv, key; + int num; + static char *keystr = "01234567"; + static char *in1 = "0123456789ABCEDFdata 12345"; + static char *in2 = "9876543210abcdefdata 12345"; + unsigned char out[100]; + int i; - des_set_key((des_cblock *)keystr,ks); + des_set_key((des_cblock *)keystr, ks); - num=0; - memset(iv,0,8); - des_cfb64_encrypt(in1,out,26,ks,(des_cblock *)iv,&num,1); - for (i=0; i<26; i++) - fprintf(stderr,"%02X ",out[i]); - fprintf(stderr,"\n"); + num = 0; + memset(iv, 0, 8); + des_cfb64_encrypt(in1, out, 26, ks, (des_cblock *)iv, &num, 1); + for (i = 0; i < 26; i++) + fprintf(stderr, "%02X ", out[i]); + fprintf(stderr, "\n"); - num=0; - memset(iv,0,8); - des_cfb64_encrypt(in2,out,26,ks,(des_cblock *)iv,&num,1); - for (i=0; i<26; i++) - fprintf(stderr,"%02X ",out[i]); - fprintf(stderr,"\n"); - } + num = 0; + memset(iv, 0, 8); + des_cfb64_encrypt(in2, out, 26, ks, (des_cblock *)iv, &num, 1); + for (i = 0; i < 26; i++) + fprintf(stderr, "%02X ", out[i]); + fprintf(stderr, "\n"); +} int rc4() - { - static char *keystr="0123456789abcdef"; - RC4_KEY key; - unsigned char in[100],out[100]; - int i; +{ + static char *keystr = "0123456789abcdef"; + RC4_KEY key; + unsigned char in[100], out[100]; + int i; - RC4_set_key(&key,16,keystr); - in[0]='\0'; - strcpy(in,"0123456789ABCEDFdata 12345"); - RC4(key,26,in,out); + RC4_set_key(&key, 16, keystr); + in[0] = '\0'; + strcpy(in, "0123456789ABCEDFdata 12345"); + RC4(key, 26, in, out); - for (i=0; i<26; i++) - fprintf(stderr,"%02X ",out[i]); - fprintf(stderr,"\n"); + for (i = 0; i < 26; i++) + fprintf(stderr, "%02X ", out[i]); + fprintf(stderr, "\n"); - RC4_set_key(&key,16,keystr); - in[0]='\0'; - strcpy(in,"9876543210abcdefdata 12345"); - RC4(key,26,in,out); + RC4_set_key(&key, 16, keystr); + in[0] = '\0'; + strcpy(in, "9876543210abcdefdata 12345"); + RC4(key, 26, in, out); - for (i=0; i<26; i++) - fprintf(stderr,"%02X ",out[i]); - fprintf(stderr,"\n"); - } + for (i = 0; i < 26; i++) + fprintf(stderr, "%02X ", out[i]); + fprintf(stderr, "\n"); +} -- cgit v1.2.3