1 files changed, 51 insertions, 96 deletions

diff --git a/src/lib/libssl/src/fips/sha1/fips_standalone_sha1.c b/src/lib/libcrypto/o_str.c
index 1c2ec469e9..56104a6c34 100644
--- a/src/lib/libssl/src/fips/sha1/fips_standalone_sha1.c
+++ b/src/lib/libcrypto/o_str.c
@@ -1,3 +1,7 @@
+/* crypto/o_str.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
 /* ====================================================================
  * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
  *
@@ -44,113 +48,64 @@
  * STRICT 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
  *
  */
 
-#include <openssl/sha.h>
-#include <openssl/hmac.h>
-#include <openssl/opensslconf.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int FIPS_selftest_failed() { return 0; }
+#include <ctype.h>
+#include <e_os.h>
+#include "o_str.h"
 
-#ifdef OPENSSL_FIPS
-
-static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
-                      const char *key)
-    {
-    int len=strlen(key);
-    int i;
-    unsigned char keymd[HMAC_MAX_MD_CBLOCK];
-    unsigned char pad[HMAC_MAX_MD_CBLOCK];
+#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
+    !defined(OPENSSL_SYSNAME_WIN32) && \
+    !defined(NETWARE_CLIB)
+# include <strings.h>
+#endif
 
-    if (len > SHA_CBLOCK)
+int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
         {
-        SHA1_Init(md_ctx);
-        SHA1_Update(md_ctx,key,len);
-        SHA1_Final(keymd,md_ctx);
-        len=20;
-        }
-    else
-        memcpy(keymd,key,len);
-    memset(&keymd[len],'\0',HMAC_MAX_MD_CBLOCK-len);
-
-    for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
-        pad[i]=0x36^keymd[i];
-    SHA1_Init(md_ctx);
-    SHA1_Update(md_ctx,pad,SHA_CBLOCK);
-
-    for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
-        pad[i]=0x5c^keymd[i];
-    SHA1_Init(o_ctx);
-    SHA1_Update(o_ctx,pad,SHA_CBLOCK);
-    }
-
-static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
-    {
-    unsigned char buf[20];
-
-    SHA1_Final(buf,md_ctx);
-    SHA1_Update(o_ctx,buf,sizeof buf);
-    SHA1_Final(md,o_ctx);
-    }
-
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
+        while (*str1 && *str2 && n)
+                {
+                int res = toupper(*str1) - toupper(*str2);
+                if (res) return res < 0 ? -1 : 1;
+                str1++;
+                str2++;
+                n--;
+                }
+        if (n == 0)
+                return 0;
+        if (*str1)
+                return 1;
+        if (*str2)
+                return -1;
+        return 0;
+#else
+        /* Recursion hazard warning! Whenever strncasecmp is #defined as
+         * OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be
+         * defined as well. */
+        return strncasecmp(str1, str2, n);
 #endif
-
-int main(int argc,char **argv)
-    {
-#ifdef OPENSSL_FIPS
-    static char key[]="etaonrishdlcupfm";
-    int n;
-
-    if(argc < 2)
+        }
+int OPENSSL_strcasecmp(const char *str1, const char *str2)
         {
-        fprintf(stderr,"%s [<file>]+\n",argv[0]);
-        exit(1);
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
+        return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
+#else
+        return strcasecmp(str1, str2);
+#endif
         }
 
-    for(n=1 ; n < argc ; ++n)
+int OPENSSL_memcmp(const void *v1,const void *v2,size_t n)
         {
-        FILE *f=fopen(argv[n],"rb");
-        SHA_CTX md_ctx,o_ctx;
-        unsigned char md[20];
-        int i;
-
-        if(!f)
-            {
-            perror(argv[n]);
-            exit(2);
-            }
+        const unsigned char *c1=v1,*c2=v2;
+        int ret=0;
 
-        hmac_init(&md_ctx,&o_ctx,key);
-        for( ; ; )
-            {
-            char buf[1024];
-            int l=fread(buf,1,sizeof buf,f);
+        while(n && (ret=*c1-*c2)==0) n--,c1++,c2++;
 
-            if(l == 0)
-                {
-                if(ferror(f))
-                    {
-                    perror(argv[n]);
-                    exit(3);
-                    }
-                else
-                    break;
-                }
-            SHA1_Update(&md_ctx,buf,l);
-            }
-        hmac_final(md,&md_ctx,&o_ctx);
-
-        printf("HMAC-SHA1(%s)= ",argv[n]);
-        for(i=0 ; i < 20 ; ++i)
-            printf("%02x",md[i]);
-        printf("\n");
+        return ret;
         }
-#endif
-    return 0;
-    }
-
-