Add length limitation from SP800-38E.

[openssl.git] / crypto / rc2 / rc2test.c

diff --git a/crypto/rc2/rc2test.c b/crypto/rc2/rc2test.c
index a243998077f10b388db47b3372edb488ae144f17..0e117436bb33d8bcd8c5e4ff531757e1b2092dcb 100644 (file)
--- a/crypto/rc2/rc2test.c
+++ b/crypto/rc2/rc2test.c
@@ -62,9 +62,19 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "rc2.h"
 
-unsigned char RC2key[4][16]={
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_RC2
+int main(int argc, char *argv[])
+{
+    printf("No RC2 support\n");
+    return(0);
+}
+#else
+#include <openssl/rc2.h>
+
+static unsigned char RC2key[4][16]={
        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -75,14 +85,14 @@ unsigned char RC2key[4][16]={
         0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F},
        };
 
-unsigned char RC2plain[4][8]={
+static unsigned char RC2plain[4][8]={
        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
        };
 
-unsigned char RC2cipher[4][8]={
+static unsigned char RC2cipher[4][8]={
        {0x1C,0x19,0x8A,0x83,0x8D,0xF0,0x28,0xB7},
        {0x21,0x82,0x9C,0x78,0xA9,0xF9,0xC0,0x74},
        {0x13,0xDB,0x35,0x17,0xD3,0x21,0x86,0x9E},
@@ -125,14 +135,8 @@ static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
        }; 
 
 
-#ifndef NOPROTO
 /*static int cfb64_test(unsigned char *cfb_cipher);*/
 static char *pt(unsigned char *p);
-#else
-/*static int cfb64_test(); */
-static char *pt();
-#endif
-
 #endif
 
 int main(int argc, char *argv[])
@@ -201,7 +205,10 @@ int main(int argc, char *argv[])
                printf("ok\n");
 #endif
 
-       exit(err);
+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif
+       EXIT(err);
        return(err);
        }
 
@@ -264,3 +271,4 @@ static char *pt(unsigned char *p)
        }
        
 #endif
+#endif