Changeset 2191 for trunk

Timestamp:

Jul 3, 2005, 9:01:54 AM (20 years ago)

Author:

bird

Message:

Ported crypt from GLIBC 2.3.x CVS.

Location:

trunk/src/emx

Files:

• include/crypt.h (added)
• src/lib/lgpl/crypt/crypt-entry.c (modified) (5 diffs, 1 prop)
• src/lib/lgpl/crypt/crypt.c (modified) (1 diff, 1 prop)
• src/lib/lgpl/crypt/crypt.h (deleted)
• src/lib/lgpl/crypt/crypt_util.c (modified) (9 diffs, 1 prop)
• src/lib/lgpl/crypt/md5-crypt.c (modified) (3 diffs, 1 prop)
• src/lib/lgpl/crypt/md5.c (modified) (4 diffs, 1 prop)
• src/lib/lgpl/crypt/md5.h (modified) (2 diffs, 1 prop)
• src/lib/lgpl/include/libc-alias-glibc.h (modified) (2 diffs, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/lgpl/crypt/crypt-entry.c

@@ -25 +25 @@
  */
 
+#include "libc-alias-glibc.h"
 #ifdef DEBUG
 #include <stdio.h>
@@ -48 +49 @@
 /* Prototypes for local functions.  */
 #if __STDC__ - 0
-#ifndef __GNU_LIBRARY__
+#if !defined __GNU_LIBRARY__ && !defined __INNOTEK_LIBC__
 void _ufc_clearmem (char *start, int cnt);
 #else
@@ -80 +81 @@
   ufc_long xx = 25; /* to cope with GCC long long compiler bugs */
 
-#ifdef _LIBC
+#if defined _LIBC || defined __INNOTEK_LIBC__
   /* Try to find out whether we have to use MD5 encryption replacement.  */
   if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
@@ -119 +120 @@
 
 char *
-crypt (key, salt)
+_STD(crypt) (key, salt)
      const char *key;
      const char *salt;
 {
-#ifdef _LIBC
+#if defined _LIBC || defined __INNOTEK_LIBC__
   /* Try to find out whether we have to use MD5 encryption replacement.  */
   if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
@@ -137 +138 @@
  * They don't need to call init_des.
  */
-#ifdef _LIBC
+#if defined _LIBC || defined __INNOTEK_LIBC__
 weak_alias (crypt, fcrypt)
 #else

trunk/src/emx/src/lib/lgpl/crypt/crypt.c

@@ -25 +25 @@
  */
 
+#include "libc-alias-glibc.h"
 #include "ufc-crypt.h"
 #include "crypt.h"

trunk/src/emx/src/lib/lgpl/crypt/crypt_util.c

@@ -25 +25 @@
  */
 
+#include "libc-alias-glibc.h"
 #ifdef DEBUG
 #include <stdio.h>
@@ -49 +50 @@
 /* Prototypes for local functions.  */
 #if __STDC__ - 0
-#ifndef __GNU_LIBRARY__
+#if !defined(__GNU_LIBRARY__) && !defined(__INNOTEK_LIBC__)
 void _ufc_clearmem (char *start, int cnt);
 void _ufc_copymem (char *from, char *to, int cnt);
@@ -260 +261 @@
  * (crypt/encrypt/setkey)
  */
-struct crypt_data _ufc_foobar;
+struct crypt_data _ufc_foobar = {{0}};
 
 #ifdef __GNU_LIBRARY__
@@ -267 +268 @@
 __libc_lock_define_initialized (static, _ufc_tables_lock)
 #endif
-
-#ifdef DEBUG
+#ifdef __INNOTEK_LIBC__
+#include <sys/smutex.h>
+#endif
+
+
+
+#if defined(DEBUG) && !defined(__INNOTEK_LIBC__)
 
 void
@@ -303 +309 @@
 #endif
 
-#ifndef __GNU_LIBRARY__
+#if !defined(__GNU_LIBRARY__) && !defined(__INNOTEK_LIBC__)
 /*
  * Silly rewrites of 'bzero'/'memset'. I do so
@@ -369 +375 @@
       goto small_tables_done;
 #endif
+#ifdef __INNOTEK_LIBC__
+    static _smutex smtx;
+    _smutex_request(&smtx);
+    if(small_tables_initialized)
+      goto small_tables_done;
+#endif
+
+
 
     /*
@@ -474 +488 @@
     __libc_lock_unlock(_ufc_tables_lock);
 #endif
+#ifdef __INNOTEK_LIBC__
+small_tables_done:
+    _smutex_release(&smtx);
+#endif
   }
 
@@ -874 +892 @@
 
 void
-encrypt(__block, __edflag)
+_STD(encrypt)(__block, __edflag)
      char *__block;
      int __edflag;
@@ -908 +926 @@
 
 void
-setkey(__key)
+_STD(setkey)(__key)
      __const char *__key;
 {

trunk/src/emx/src/lib/lgpl/crypt/md5-crypt.c

@@ -21 +21 @@
    02111-1307 USA.  */
 
+#include "libc-alias-glibc.h"
 #include <assert.h>
 #include <errno.h>
@@ -214 +215 @@
   if (buflen <= 0)
     {
-      __set_errno (ERANGE);
+      errno = ERANGE;
       buffer = NULL;
     }
@@ -263 +264 @@
 }
 
-#ifndef _LIBC
+#if !defined _LIBC && !defined __INNOTEK_LIBC__
 static void
 __attribute__ ((__destructor__))

trunk/src/emx/src/lib/lgpl/crypt/md5.c

@@ -22 +22 @@
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
+#include "libc-alias-glibc.h"
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -28 +29 @@
 #include <sys/types.h>
 
-#if STDC_HEADERS || defined _LIBC
+#if STDC_HEADERS || defined _LIBC || defined __INNOTEK_LIBC__
 # include <stdlib.h>
 # include <string.h>
@@ -39 +40 @@
 #include "md5.h"
 
-#ifdef _LIBC
+#if defined _LIBC || defined __INNOTEK_LIBC__
 # include <endian.h>
 # if __BYTE_ORDER == __BIG_ENDIAN
@@ -246 +247 @@
   if (len >= 64)
     {
-#if !_STRING_ARCH_unaligned
+#if defined _STRING_ARCH_unaligned && !_STRING_ARCH_unaligned
 /* To check alignment gcc has an appropriate operator.  Other
    compilers don't.  */

trunk/src/emx/src/lib/lgpl/crypt/md5.h

@@ -24 +24 @@
 #include <stdio.h>
 
-#if defined HAVE_LIMITS_H || _LIBC
+#if defined HAVE_LIMITS_H || (defined _LIBC && _LIBC) || defined(__INNOTEK_LIBC__)
 # include <limits.h>
 #endif
@@ -35 +35 @@
    is usually not possible.  */
 
-#ifdef _LIBC
+#if defined _LIBC || defined __INNOTEK_LIBC__
 # include <stdint.h>
 typedef uint32_t md5_uint32;

trunk/src/emx/src/lib/lgpl/include/libc-alias-glibc.h

@@ -43 +43 @@
 
 #ifndef _LIBC_SYMBOLS_H /* hackityhack */
-#undef weak_alias
-#define weak_alias(name, aliasname)
+# undef weak_alias
+# ifdef __WANT_WEAK__
+#  define weak_alias(name, aliasname) \
+    extern __typeof(name) aliasname  __attribute__((weak, alias(#name)));
+# else
+#  define weak_alias(name, aliasname)
+# endif
 #undef INTDEF
 #define INTDEF(name)
@@ -566 +571 @@
 #define __lgamma_r  _STD(lgamma_r)
 
-
 #endif

trunk/src/emx/src/lib/libc.def

@@ -1892 +1892 @@
     "__std_nftw" @1892
     "___libc_FHSetFlags" @1893
+    "___stpncpy" @1894
+    ; crypt
+    "___crypt_r" @1895
+    "___encrypt_r" @1896
+    "___init_des" @1897
+    "___init_des_r" @1898
+    "___md5_buffer" @1899
+    "___md5_crypt" @1900
+    "___md5_crypt_r" @1901
+    "___md5_finish_ctx" @1902
+    "___md5_init_ctx" @1903
+    "___md5_process_block" @1904
+    "___md5_process_bytes" @1905
+    "___md5_read_ctx" @1906
+    "___md5_stream" @1907
+    "___setkey_r" @1908
+    "__std_crypt" @1909
+    "__std_encrypt" @1910
+    "__std_setkey" @1911
+    "__ufc_dofinalperm_r" @1912
+    "__ufc_doit_r" @1913
+    "__ufc_foobar" @1914
+    "__ufc_mk_keytab_r" @1915
+    "__ufc_output_conversion_r" @1916
+    "__ufc_setup_salt_r" @1917