2 files changed, 8 insertions, 186 deletions
diff --git a/src/lib/libcrypto/o_str.c b/src/lib/libcrypto/o_str.c
index c3ab1f8093..1c70d263b6 100644
--- a/src/lib/libcrypto/o_str.c
+++ b/src/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
+ * Written by Theo de Raadt.  Public domain.
- * 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).
- *
 */
 #include <ctype.h>
 #include <e_os.h>
 #include "o_str.h"
+#include <string.h>
-#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
-    !defined(OPENSSL_SYSNAME_WIN32) && \
-    !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
 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;
+        return memcmp(v1, v2, n);
-        int ret = 0;
-        while (n && (ret = *c1 - *c2) == 0) n--, c1++, c2++;
-        return ret;
 }
diff --git a/src/lib/libssl/src/crypto/o_str.c b/src/lib/libssl/src/crypto/o_str.c
index c3ab1f8093..1c70d263b6 100644
--- a/src/lib/libssl/src/crypto/o_str.c
+++ b/src/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
+ * Written by Theo de Raadt.  Public domain.
- * 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).
- *
 */
 #include <ctype.h>
 #include <e_os.h>
 #include "o_str.h"
+#include <string.h>
-#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
-    !defined(OPENSSL_SYSNAME_WIN32) && \
-    !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
 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;
+        return memcmp(v1, v2, n);
-        int ret = 0;
-        while (n && (ret = *c1 - *c2) == 0) n--, c1++, c2++;
-        return ret;
 }

diff --git a/src/lib/libcrypto/o_str.c b/src/lib/libcrypto/o_str.c index c3ab1f8093..1c70d263b6 100644 --- a/src/lib/libcrypto/o_str.c +++ b/src/lib/libcrypto/o_str.c
@@ -1,115 +1,26 @@
1	/* crypto/o_str.c -- mode:C; c-file-style: "eay" -- */	1	/*
2	/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL	2	* Written by Theo de Raadt. Public domain.
3	* project 2003.
4	*/
5	/* ====================================================================
6	* Copyright (c) 2003 The OpenSSL Project. All rights reserved.
7	*
8	* Redistribution and use in source and binary forms, with or without
9	* modification, are permitted provided that the following conditions
10	* are met:
11	*
12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.
14	*
15	* 2. Redistributions in binary form must reproduce the above copyright
16	* notice, this list of conditions and the following disclaimer in
17	* the documentation and/or other materials provided with the
18	* distribution.
19	*
20	* 3. All advertising materials mentioning features or use of this
21	* software must display the following acknowledgment:
22	* "This product includes software developed by the OpenSSL Project
23	* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
24	*
25	* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26	* endorse or promote products derived from this software without
27	* prior written permission. For written permission, please contact
28	* openssl-core@openssl.org.
29	*
30	* 5. Products derived from this software may not be called "OpenSSL"
31	* nor may "OpenSSL" appear in their names without prior written
32	* permission of the OpenSSL Project.
33	*
34	* 6. Redistributions of any form whatsoever must retain the following
35	* acknowledgment:
36	* "This product includes software developed by the OpenSSL Project
37	* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
38	*
39	* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40	* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48	* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	* OF THE POSSIBILITY OF SUCH DAMAGE.
51	* ====================================================================
52	*
53	* This product includes cryptographic software written by Eric Young
54	* (eay@cryptsoft.com). This product includes software written by Tim
55	* Hudson (tjh@cryptsoft.com).
56	*
57	*/	3	*/
58		4
59	#include <ctype.h>	5	#include <ctype.h>
60	#include <e_os.h>	6	#include <e_os.h>
61	#include "o_str.h"	7	#include "o_str.h"
62		8	#include <string.h>
63	#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
64	!defined(OPENSSL_SYSNAME_WIN32) && \
65	!defined(NETWARE_CLIB)
66	# include <strings.h>
67	#endif
68		9
69	int	10	int
70	OPENSSL_strncasecmp(const char str1, const char str2, size_t n)	11	OPENSSL_strncasecmp(const char str1, const char str2, size_t n)
71	{	12	{
72	#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
73	while (str1 && str2 && n) {
74	int res = toupper(str1) - toupper(str2);
75	if (res)
76	return res < 0 ? -1 : 1;
77	str1++;
78	str2++;
79	n--;
80	}
81	if (n == 0)
82	return 0;
83	if (*str1)
84	return 1;
85	if (*str2)
86	return -1;
87	return 0;
88	#else
89	/* Recursion hazard warning! Whenever strncasecmp is #defined as
90	* OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be
91	* defined as well. */
92	return strncasecmp(str1, str2, n);	13	return strncasecmp(str1, str2, n);
93	#endif
94	}	14	}
95		15
96	int	16	int
97	OPENSSL_strcasecmp(const char str1, const char str2)	17	OPENSSL_strcasecmp(const char str1, const char str2)
98	{	18	{
99	#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
100	return OPENSSL_strncasecmp(str1, str2, (size_t) - 1);
101	#else
102	return strcasecmp(str1, str2);	19	return strcasecmp(str1, str2);
103	#endif
104	}	20	}
105		21
106	int	22	int
107	OPENSSL_memcmp(const void v1, const void v2, size_t n)	23	OPENSSL_memcmp(const void v1, const void v2, size_t n)
108	{	24	{
109	const unsigned char c1 = v1, c2 = v2;	25	return memcmp(v1, v2, n);
110	int ret = 0;
111
112	while (n && (ret = c1 - c2) == 0) n--, c1++, c2++;
113
114	return ret;
115	}	26	}


diff --git a/src/lib/libssl/src/crypto/o_str.c b/src/lib/libssl/src/crypto/o_str.c index c3ab1f8093..1c70d263b6 100644 --- a/src/lib/libssl/src/crypto/o_str.c +++ b/src/lib/libssl/src/crypto/o_str.c
@@ -1,115 +1,26 @@
1	/* crypto/o_str.c -- mode:C; c-file-style: "eay" -- */	1	/*
2	/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL	2	* Written by Theo de Raadt. Public domain.
3	* project 2003.
4	*/
5	/* ====================================================================
6	* Copyright (c) 2003 The OpenSSL Project. All rights reserved.
7	*
8	* Redistribution and use in source and binary forms, with or without
9	* modification, are permitted provided that the following conditions
10	* are met:
11	*
12	* 1. Redistributions of source code must retain the above copyright
13	* notice, this list of conditions and the following disclaimer.
14	*
15	* 2. Redistributions in binary form must reproduce the above copyright
16	* notice, this list of conditions and the following disclaimer in
17	* the documentation and/or other materials provided with the
18	* distribution.
19	*
20	* 3. All advertising materials mentioning features or use of this
21	* software must display the following acknowledgment:
22	* "This product includes software developed by the OpenSSL Project
23	* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
24	*
25	* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26	* endorse or promote products derived from this software without
27	* prior written permission. For written permission, please contact
28	* openssl-core@openssl.org.
29	*
30	* 5. Products derived from this software may not be called "OpenSSL"
31	* nor may "OpenSSL" appear in their names without prior written
32	* permission of the OpenSSL Project.
33	*
34	* 6. Redistributions of any form whatsoever must retain the following
35	* acknowledgment:
36	* "This product includes software developed by the OpenSSL Project
37	* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
38	*
39	* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40	* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48	* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	* OF THE POSSIBILITY OF SUCH DAMAGE.
51	* ====================================================================
52	*
53	* This product includes cryptographic software written by Eric Young
54	* (eay@cryptsoft.com). This product includes software written by Tim
55	* Hudson (tjh@cryptsoft.com).
56	*
57	*/	3	*/
58		4
59	#include <ctype.h>	5	#include <ctype.h>
60	#include <e_os.h>	6	#include <e_os.h>
61	#include "o_str.h"	7	#include "o_str.h"
62		8	#include <string.h>
63	#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
64	!defined(OPENSSL_SYSNAME_WIN32) && \
65	!defined(NETWARE_CLIB)
66	# include <strings.h>
67	#endif
68		9
69	int	10	int
70	OPENSSL_strncasecmp(const char str1, const char str2, size_t n)	11	OPENSSL_strncasecmp(const char str1, const char str2, size_t n)
71	{	12	{
72	#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
73	while (str1 && str2 && n) {
74	int res = toupper(str1) - toupper(str2);
75	if (res)
76	return res < 0 ? -1 : 1;
77	str1++;
78	str2++;
79	n--;
80	}
81	if (n == 0)
82	return 0;
83	if (*str1)
84	return 1;
85	if (*str2)
86	return -1;
87	return 0;
88	#else
89	/* Recursion hazard warning! Whenever strncasecmp is #defined as
90	* OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be
91	* defined as well. */
92	return strncasecmp(str1, str2, n);	13	return strncasecmp(str1, str2, n);
93	#endif
94	}	14	}
95		15
96	int	16	int
97	OPENSSL_strcasecmp(const char str1, const char str2)	17	OPENSSL_strcasecmp(const char str1, const char str2)
98	{	18	{
99	#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
100	return OPENSSL_strncasecmp(str1, str2, (size_t) - 1);
101	#else
102	return strcasecmp(str1, str2);	19	return strcasecmp(str1, str2);
103	#endif
104	}	20	}
105		21
106	int	22	int
107	OPENSSL_memcmp(const void v1, const void v2, size_t n)	23	OPENSSL_memcmp(const void v1, const void v2, size_t n)
108	{	24	{
109	const unsigned char c1 = v1, c2 = v2;	25	return memcmp(v1, v2, n);
110	int ret = 0;
111
112	while (n && (ret = c1 - c2) == 0) n--, c1++, c2++;
113
114	return ret;
115	}	26	}