Three wrappers in this file: OPENSSL_strncasecmp, OPENSSL_strcasecmp,

and OPENSSL_memcmp.

All modern systems have strncasecmp.  No need to rewrite it.

Same with memcmp, call the system one!  It is more likely to be hot
in the icache, and is specifically optimized for the platform.  I
thought these OpenSSL people cared about performance?

ok tedu

diff --git a/lib/libcrypto/o_str.c b/lib/libcrypto/o_str.c
index c3ab1f8..1c70d26 100644 (file)
--- a/lib/libcrypto/o_str.c
+++ b/lib/libcrypto/o_str.c
@@ -1,115 +1,26 @@
-/* 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * 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).
- *
+/*
+ * Written by Theo de Raadt.  Public domain.
  */
 
 #include <ctype.h>
 #include <e_os.h>
 #include "o_str.h"
-
-#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
-    !defined(OPENSSL_SYSNAME_WIN32) && \
-    !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
+#include <string.h>
 
 int
 OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 {
-#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
 OPENSSL_strcasecmp(const char *str1, const char *str2)
 {
-#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
-       return OPENSSL_strncasecmp(str1, str2, (size_t) - 1);
-#else
        return strcasecmp(str1, str2);
-#endif
 }
 
 int
 OPENSSL_memcmp(const void *v1, const void *v2, size_t n)
 {
-       const unsigned char *c1 = v1, *c2 = v2;
-       int ret = 0;
-
-       while (n && (ret = *c1 - *c2) == 0) n--, c1++, c2++;
-
-       return ret;
+       return memcmp(v1, v2, n);
 }

diff --git a/lib/libssl/src/crypto/o_str.c b/lib/libssl/src/crypto/o_str.c
index c3ab1f8..1c70d26 100644 (file)
--- a/lib/libssl/src/crypto/o_str.c
+++ b/lib/libssl/src/crypto/o_str.c
@@ -1,115 +1,26 @@
-/* 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.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * 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).
- *
+/*
+ * Written by Theo de Raadt.  Public domain.
  */
 
 #include <ctype.h>
 #include <e_os.h>
 #include "o_str.h"
-
-#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
-    !defined(OPENSSL_SYSNAME_WIN32) && \
-    !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
+#include <string.h>
 
 int
 OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 {
-#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
 OPENSSL_strcasecmp(const char *str1, const char *str2)
 {
-#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
-       return OPENSSL_strncasecmp(str1, str2, (size_t) - 1);
-#else
        return strcasecmp(str1, str2);
-#endif
 }
 
 int
 OPENSSL_memcmp(const void *v1, const void *v2, size_t n)
 {
-       const unsigned char *c1 = v1, *c2 = v2;
-       int ret = 0;
-
-       while (n && (ret = *c1 - *c2) == 0) n--, c1++, c2++;
-
-       return ret;
+       return memcmp(v1, v2, n);
 }