mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
9d46370ca3
This automatically-generated patch converts 703 function definitions in glibc from old-style K&R to prototype-style. This conversion is deliberately simplistic, excluding any tricky cases as even a patch covering only simple cases is still very large. Currently excluded are: sysdeps files (to improve test coverage for the initial patch); files containing assertions (to avoid line number changes so that generated libraries can be compared); any cases where the generated function declaration would involve lines over 79 characters and so need to be wrapped; any cases with array parameters or other cases where parameter declarators don't end with the parameter name; any other cases that my script didn't parse. I didn't try to make the ChangeLog generation indicate when function definitions are conditional; it just lists the functions changed without regard to that. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/cert.c (good_bye): Convert to prototype-style function definition. (get8): Likewise. (put8): Likewise. * crypt/crypt-entry.c (crypt): Likewise. (__fcrypt): Likewise. * crypt/crypt_util.c (_ufc_prbits): Likewise. (_ufc_set_bits): Likewise. (_ufc_clearmem): Likewise. (__init_des_r): Likewise. (shuffle_sb): Likewise. (shuffle_sb): Likewise. (_ufc_setup_salt_r): Likewise. (_ufc_mk_keytab_r): Likewise. (_ufc_dofinalperm_r): Likewise. (encrypt): Likewise. (__setkey_r): Likewise. (setkey): Likewise. * crypt/md5.c (md5_init_ctx): Likewise. (md5_read_ctx): Likewise. (md5_finish_ctx): Likewise. (md5_stream): Likewise. (md5_buffer): Likewise. (md5_process_bytes): Likewise. * crypt/sha256.c (__sha256_init_ctx): Likewise. (__sha256_finish_ctx): Likewise. (__sha256_process_bytes): Likewise. * crypt/sha512.c (__sha512_init_ctx): Likewise. (__sha512_finish_ctx): Likewise. (__sha512_process_bytes): Likewise. * ctype/isctype.c (__isctype): Likewise. * debug/backtrace.c (__backtrace): Likewise. * debug/backtracesymsfd.c (__backtrace_symbols_fd): Likewise. * debug/fgets_chk.c (__fgets_chk): Likewise. * debug/fgets_u_chk.c (__fgets_unlocked_chk): Likewise. * debug/memcpy_chk.c (__memcpy_chk): Likewise. * debug/memmove_chk.c (MEMMOVE_CHK): Likewise. * debug/mempcpy_chk.c (__mempcpy_chk): Likewise. * debug/memset_chk.c (__memset_chk): Likewise. * debug/strcat_chk.c (__strcat_chk): Likewise. * debug/strncat_chk.c (__strncat_chk): Likewise. * debug/strncpy_chk.c (__strncpy_chk): Likewise. * debug/vsprintf_chk.c (_IO_str_chk_overflow): Likewise. * dirent/dirfd.c (dirfd): Likewise. * dirent/getdents.c (__getdirentries): Likewise. * dirent/getdents64.c (getdirentries64): Likewise. * dirent/rewinddir.c (__rewinddir): Likewise. * dirent/seekdir.c (seekdir): Likewise. * dirent/telldir.c (telldir): Likewise. * elf/sln.c (makesymlinks): Likewise. (makesymlink): Likewise. * gmon/gmon.c (__moncontrol): Likewise. (__monstartup): Likewise. (write_hist): Likewise. (write_call_graph): Likewise. (write_bb_counts): Likewise. * grp/setgroups.c (setgroups): Likewise. * inet/inet_lnaof.c (inet_lnaof): Likewise. * inet/inet_net.c (inet_network): Likewise. * inet/inet_netof.c (inet_netof): Likewise. * inet/rcmd.c (rresvport_af): Likewise. (rresvport): Likewise. * io/access.c (__access): Likewise. * io/chdir.c (__chdir): Likewise. * io/chmod.c (__chmod): Likewise. * io/chown.c (__chown): Likewise. * io/close.c (__close): Likewise. * io/creat.c (creat): Likewise. * io/creat64.c (creat64): Likewise. * io/dup.c (__dup): Likewise. * io/dup2.c (__dup2): Likewise. * io/dup3.c (__dup3): Likewise. * io/euidaccess.c (__euidaccess): Likewise. * io/faccessat.c (faccessat): Likewise. * io/fchmod.c (__fchmod): Likewise. * io/fchmodat.c (fchmodat): Likewise. * io/fchown.c (__fchown): Likewise. * io/fchownat.c (fchownat): Likewise. * io/fcntl.c (__fcntl): Likewise. * io/flock.c (__flock): Likewise. * io/fts.c (fts_load): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. (fts_sort): Likewise. (fts_alloc): Likewise. (fts_lfree): Likewise. (fts_palloc): Likewise. (fts_padjust): Likewise. (fts_maxarglen): Likewise. (fts_safe_changedir): Likewise. * io/getwd.c (getwd): Likewise. * io/isatty.c (__isatty): Likewise. * io/lchown.c (__lchown): Likewise. * io/link.c (__link): Likewise. * io/linkat.c (linkat): Likewise. * io/lseek.c (__libc_lseek): Likewise. * io/mkdir.c (__mkdir): Likewise. * io/mkdirat.c (mkdirat): Likewise. * io/mkfifo.c (mkfifo): Likewise. * io/mkfifoat.c (mkfifoat): Likewise. * io/open.c (__libc_open): Likewise. * io/open64.c (__libc_open64): Likewise. * io/readlink.c (__readlink): Likewise. * io/readlinkat.c (readlinkat): Likewise. * io/rmdir.c (__rmdir): Likewise. * io/symlink.c (__symlink): Likewise. * io/symlinkat.c (symlinkat): Likewise. * io/ttyname.c (ttyname): Likewise. * io/ttyname_r.c (__ttyname_r): Likewise. * io/umask.c (__umask): Likewise. * io/unlink.c (__unlink): Likewise. * io/unlinkat.c (unlinkat): Likewise. * io/utime.c (utime): Likewise. * libio/clearerr.c (clearerr): Likewise. * libio/clearerr_u.c (clearerr_unlocked): Likewise. * libio/feof.c (_IO_feof): Likewise. * libio/feof_u.c (feof_unlocked): Likewise. * libio/ferror.c (_IO_ferror): Likewise. * libio/ferror_u.c (ferror_unlocked): Likewise. * libio/filedoalloc.c (_IO_file_doallocate): Likewise. * libio/fileno.c (__fileno): Likewise. * libio/fputc.c (fputc): Likewise. * libio/fputc_u.c (fputc_unlocked): Likewise. * libio/fputwc.c (fputwc): Likewise. * libio/fputwc_u.c (fputwc_unlocked): Likewise. * libio/freopen.c (freopen): Likewise. * libio/freopen64.c (freopen64): Likewise. * libio/fseek.c (fseek): Likewise. * libio/fseeko.c (fseeko): Likewise. * libio/fseeko64.c (fseeko64): Likewise. * libio/ftello.c (__ftello): Likewise. * libio/ftello64.c (ftello64): Likewise. * libio/fwide.c (fwide): Likewise. * libio/genops.c (_IO_un_link): Likewise. (_IO_link_in): Likewise. (_IO_least_marker): Likewise. (_IO_switch_to_main_get_area): Likewise. (_IO_switch_to_backup_area): Likewise. (_IO_switch_to_get_mode): Likewise. (_IO_free_backup_area): Likewise. (_IO_switch_to_put_mode): Likewise. (__overflow): Likewise. (__underflow): Likewise. (__uflow): Likewise. (_IO_setb): Likewise. (_IO_doallocbuf): Likewise. (_IO_default_underflow): Likewise. (_IO_default_uflow): Likewise. (_IO_default_xsputn): Likewise. (_IO_sgetn): Likewise. (_IO_default_xsgetn): Likewise. (_IO_sync): Likewise. (_IO_default_setbuf): Likewise. (_IO_default_seekpos): Likewise. (_IO_default_doallocate): Likewise. (_IO_init): Likewise. (_IO_old_init): Likewise. (_IO_default_sync): Likewise. (_IO_default_finish): Likewise. (_IO_default_seekoff): Likewise. (_IO_sputbackc): Likewise. (_IO_sungetc): Likewise. (_IO_set_column): Likewise. (_IO_set_column): Likewise. (_IO_adjust_column): Likewise. (_IO_get_column): Likewise. (_IO_init_marker): Likewise. (_IO_remove_marker): Likewise. (_IO_marker_difference): Likewise. (_IO_marker_delta): Likewise. (_IO_seekmark): Likewise. (_IO_unsave_markers): Likewise. (_IO_nobackup_pbackfail): Likewise. (_IO_default_pbackfail): Likewise. (_IO_default_seek): Likewise. (_IO_default_stat): Likewise. (_IO_default_read): Likewise. (_IO_default_write): Likewise. (_IO_default_showmanyc): Likewise. (_IO_default_imbue): Likewise. (_IO_iter_next): Likewise. (_IO_iter_file): Likewise. * libio/getc.c (_IO_getc): Likewise. * libio/getwc.c (_IO_getwc): Likewise. * libio/iofclose.c (_IO_new_fclose): Likewise. * libio/iofdopen.c (_IO_new_fdopen): Likewise. * libio/iofflush.c (_IO_fflush): Likewise. * libio/iofflush_u.c (__fflush_unlocked): Likewise. * libio/iofgetpos.c (_IO_new_fgetpos): Likewise. * libio/iofgetpos64.c (_IO_new_fgetpos64): Likewise. * libio/iofgets.c (_IO_fgets): Likewise. * libio/iofgets_u.c (__fgets_unlocked): Likewise. * libio/iofgetws.c (fgetws): Likewise. * libio/iofgetws_u.c (fgetws_unlocked): Likewise. * libio/iofopen64.c (_IO_fopen64): Likewise. * libio/iofopncook.c (_IO_cookie_read): Likewise. (_IO_cookie_write): Likewise. (_IO_cookie_seek): Likewise. (_IO_cookie_close): Likewise. (_IO_cookie_seekoff): Likewise. (_IO_old_cookie_seek): Likewise. * libio/iofputs.c (_IO_fputs): Likewise. * libio/iofputs_u.c (__fputs_unlocked): Likewise. * libio/iofputws.c (fputws): Likewise. * libio/iofputws_u.c (fputws_unlocked): Likewise. * libio/iofread.c (_IO_fread): Likewise. * libio/iofread_u.c (__fread_unlocked): Likewise. * libio/iofsetpos.c (_IO_new_fsetpos): Likewise. * libio/iofsetpos64.c (_IO_new_fsetpos64): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * libio/iofwrite.c (_IO_fwrite): Likewise. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/iogets.c (_IO_gets): Likewise. * libio/iopadn.c (_IO_padn): Likewise. * libio/iopopen.c (_IO_new_proc_open): Likewise. (_IO_new_popen): Likewise. (_IO_new_proc_close): Likewise. * libio/ioputs.c (_IO_puts): Likewise. * libio/ioseekoff.c (_IO_seekoff_unlocked): Likewise. (_IO_seekoff): Likewise. * libio/ioseekpos.c (_IO_seekpos_unlocked): Likewise. (_IO_seekpos): Likewise. * libio/iosetbuffer.c (_IO_setbuffer): Likewise. * libio/iosetvbuf.c (_IO_setvbuf): Likewise. * libio/ioungetc.c (_IO_ungetc): Likewise. * libio/ioungetwc.c (ungetwc): Likewise. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * libio/iowpadn.c (_IO_wpadn): Likewise. * libio/libc_fatal.c (__libc_fatal): Likewise. * libio/memstream.c (__open_memstream): Likewise. (_IO_mem_sync): Likewise. (_IO_mem_finish): Likewise. * libio/oldfileops.c (_IO_old_file_init): Likewise. (_IO_old_file_close_it): Likewise. (_IO_old_file_finish): Likewise. (_IO_old_file_fopen): Likewise. (_IO_old_file_attach): Likewise. (_IO_old_file_setbuf): Likewise. (_IO_old_do_write): Likewise. (old_do_write): Likewise. (_IO_old_file_underflow): Likewise. (_IO_old_file_overflow): Likewise. (_IO_old_file_sync): Likewise. (_IO_old_file_seekoff): Likewise. (_IO_old_file_write): Likewise. (_IO_old_file_xsputn): Likewise. * libio/oldiofclose.c (_IO_old_fclose): Likewise. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/oldiofgetpos.c (_IO_old_fgetpos): Likewise. * libio/oldiofgetpos64.c (_IO_old_fgetpos64): Likewise. * libio/oldiofopen.c (_IO_old_fopen): Likewise. * libio/oldiofsetpos.c (_IO_old_fsetpos): Likewise. * libio/oldiofsetpos64.c (_IO_old_fsetpos64): Likewise. * libio/oldiopopen.c (_IO_old_proc_open): Likewise. (_IO_old_popen): Likewise. (_IO_old_proc_close): Likewise. * libio/oldpclose.c (__old_pclose): Likewise. * libio/pclose.c (__new_pclose): Likewise. * libio/peekc.c (_IO_peekc_locked): Likewise. * libio/putc.c (_IO_putc): Likewise. * libio/putc_u.c (putc_unlocked): Likewise. * libio/putchar.c (putchar): Likewise. * libio/putchar_u.c (putchar_unlocked): Likewise. * libio/putwc.c (putwc): Likewise. * libio/putwc_u.c (putwc_unlocked): Likewise. * libio/putwchar.c (putwchar): Likewise. * libio/putwchar_u.c (putwchar_unlocked): Likewise. * libio/rewind.c (rewind): Likewise. * libio/setbuf.c (setbuf): Likewise. * libio/setlinebuf.c (setlinebuf): Likewise. * libio/vasprintf.c (_IO_vasprintf): Likewise. * libio/vscanf.c (_IO_vscanf): Likewise. * libio/vsnprintf.c (_IO_strn_overflow): Likewise. * libio/vswprintf.c (_IO_wstrn_overflow): Likewise. * libio/wfiledoalloc.c (_IO_wfile_doallocate): Likewise. * libio/wgenops.c (_IO_least_wmarker): Likewise. (_IO_switch_to_main_wget_area): Likewise. (_IO_switch_to_wbackup_area): Likewise. (_IO_wsetb): Likewise. (_IO_wdefault_pbackfail): Likewise. (_IO_wdefault_finish): Likewise. (_IO_wdefault_uflow): Likewise. (__woverflow): Likewise. (__wuflow): Likewise. (__wunderflow): Likewise. (_IO_wdefault_xsputn): Likewise. (_IO_wdefault_xsgetn): Likewise. (_IO_wdoallocbuf): Likewise. (_IO_wdefault_doallocate): Likewise. (_IO_switch_to_wget_mode): Likewise. (_IO_free_wbackup_area): Likewise. (_IO_switch_to_wput_mode): Likewise. (_IO_sputbackwc): Likewise. (_IO_sungetwc): Likewise. (_IO_adjust_wcolumn): Likewise. (_IO_init_wmarker): Likewise. (_IO_wmarker_delta): Likewise. (_IO_seekwmark): Likewise. (_IO_unsave_wmarkers): Likewise. * libio/wmemstream.c (open_wmemstream): Likewise. (_IO_wmem_sync): Likewise. (_IO_wmem_finish): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/nl_langinfo_l.c (__nl_langinfo_l): Likewise. * locale/programs/simple-hash.c (init_hash): Likewise. (delete_hash): Likewise. (insert_entry): Likewise. (set_entry): Likewise. (next_prime): Likewise. (is_prime): Likewise. * locale/programs/xmalloc.c (fixup_null_alloc): Likewise. (xmalloc): Likewise. (xrealloc): Likewise. * locale/programs/xstrdup.c (xstrdup): Likewise. * localedata/collate-test.c (xstrcoll): Likewise. * localedata/xfrm-test.c (xstrcmp): Likewise. * login/getlogin_r.c (__getlogin_r): Likewise. * login/getpt.c (__posix_openpt): Likewise. * login/login_tty.c (login_tty): Likewise. * login/setlogin.c (setlogin): Likewise. * mach/msg-destroy.c (__mach_msg_destroy): Likewise. (mach_msg_destroy_port): Likewise. (mach_msg_destroy_memory): Likewise. * malloc/mcheck.c (flood): Likewise. * misc/acct.c (acct): Likewise. * misc/brk.c (__brk): Likewise. * misc/chflags.c (chflags): Likewise. * misc/chroot.c (chroot): Likewise. * misc/fchflags.c (fchflags): Likewise. * misc/fstab.c (getfsspec): Likewise. (getfsfile): Likewise. * misc/fsync.c (fsync): Likewise. * misc/ftruncate.c (__ftruncate): Likewise. * misc/ftruncate64.c (__ftruncate64): Likewise. * misc/getdomain.c (getdomainname): Likewise. (getdomainname): Likewise. * misc/gethostname.c (__gethostname): Likewise. * misc/getpass.c (getpass): Likewise. * misc/getttyent.c (skip): Likewise. (value): Likewise. * misc/gtty.c (gtty): Likewise. * misc/hsearch.c (hsearch): Likewise. (hcreate): Likewise. * misc/hsearch_r.c (__hcreate_r): Likewise. (__hdestroy_r): Likewise. * misc/ioctl.c (__ioctl): Likewise. * misc/mkdtemp.c (mkdtemp): Likewise. * misc/mkostemp.c (mkostemp): Likewise. * misc/mkostemp64.c (mkostemp64): Likewise. * misc/mkostemps.c (mkostemps): Likewise. * misc/mkostemps64.c (mkostemps64): Likewise. * misc/mkstemp.c (mkstemp): Likewise. * misc/mkstemp64.c (mkstemp64): Likewise. * misc/mkstemps.c (mkstemps): Likewise. * misc/mkstemps64.c (mkstemps64): Likewise. * misc/mktemp.c (__mktemp): Likewise. * misc/preadv.c (preadv): Likewise. * misc/preadv64.c (preadv64): Likewise. * misc/pwritev.c (pwritev): Likewise. * misc/pwritev64.c (pwritev64): Likewise. * misc/readv.c (__readv): Likewise. * misc/revoke.c (revoke): Likewise. * misc/setdomain.c (setdomainname): Likewise. * misc/setegid.c (setegid): Likewise. * misc/seteuid.c (seteuid): Likewise. * misc/sethostid.c (sethostid): Likewise. * misc/sethostname.c (sethostname): Likewise. * misc/setregid.c (__setregid): Likewise. * misc/setreuid.c (__setreuid): Likewise. * misc/sstk.c (sstk): Likewise. * misc/stty.c (stty): Likewise. * misc/syscall.c (syscall): Likewise. * misc/syslog.c (setlogmask): Likewise. * misc/truncate.c (__truncate): Likewise. * misc/truncate64.c (truncate64): Likewise. * misc/ualarm.c (ualarm): Likewise. * misc/usleep.c (usleep): Likewise. * misc/ustat.c (ustat): Likewise. * misc/writev.c (__writev): Likewise. * nptl/cleanup_compat.c (_pthread_cleanup_pop): Likewise. * nptl/old_pthread_cond_broadcast.c (__pthread_cond_broadcast_2_0): Likewise. * nptl/old_pthread_cond_destroy.c (__pthread_cond_destroy_2_0): Likewise. * nptl/old_pthread_cond_signal.c (__pthread_cond_signal_2_0): Likewise. * nptl/old_pthread_cond_wait.c (__pthread_cond_wait_2_0): Likewise. * nptl/pt-raise.c (raise): Likewise. * nptl/pthread_barrier_destroy.c (pthread_barrier_destroy): Likewise. * nptl/pthread_barrier_wait.c (__pthread_barrier_wait): Likewise. * nptl/pthread_barrierattr_destroy.c (pthread_barrierattr_destroy): Likewise. * nptl/pthread_barrierattr_init.c (pthread_barrierattr_init): Likewise. * nptl/pthread_barrierattr_setpshared.c (pthread_barrierattr_setpshared): Likewise. * nptl/pthread_cond_broadcast.c (__pthread_cond_broadcast): Likewise. * nptl/pthread_cond_destroy.c (__pthread_cond_destroy): Likewise. * nptl/pthread_cond_init.c (__pthread_cond_init): Likewise. * nptl/pthread_cond_signal.c (__pthread_cond_signal): Likewise. * nptl/pthread_condattr_destroy.c (__pthread_condattr_destroy): Likewise. * nptl/pthread_condattr_getclock.c (pthread_condattr_getclock): Likewise. * nptl/pthread_condattr_getpshared.c (pthread_condattr_getpshared): Likewise. * nptl/pthread_condattr_init.c (__pthread_condattr_init): Likewise. * nptl/pthread_condattr_setpshared.c (pthread_condattr_setpshared): Likewise. * nptl/pthread_detach.c (pthread_detach): Likewise. * nptl/pthread_equal.c (__pthread_equal): Likewise. * nptl/pthread_getcpuclockid.c (pthread_getcpuclockid): Likewise. * nptl/pthread_getspecific.c (__pthread_getspecific): Likewise. * nptl/pthread_key_delete.c (pthread_key_delete): Likewise. * nptl/pthread_mutex_consistent.c (pthread_mutex_consistent): Likewise. * nptl/pthread_mutex_destroy.c (__pthread_mutex_destroy): Likewise. * nptl/pthread_mutex_getprioceiling.c (pthread_mutex_getprioceiling): Likewise. * nptl/pthread_mutexattr_destroy.c (__pthread_mutexattr_destroy): Likewise. * nptl/pthread_mutexattr_getprotocol.c (pthread_mutexattr_getprotocol): Likewise. * nptl/pthread_mutexattr_getpshared.c (pthread_mutexattr_getpshared): Likewise. * nptl/pthread_mutexattr_getrobust.c (pthread_mutexattr_getrobust): Likewise. * nptl/pthread_mutexattr_gettype.c (pthread_mutexattr_gettype): Likewise. * nptl/pthread_mutexattr_init.c (__pthread_mutexattr_init): Likewise. * nptl/pthread_mutexattr_setprioceiling.c (pthread_mutexattr_setprioceiling): Likewise. * nptl/pthread_mutexattr_setprotocol.c (pthread_mutexattr_setprotocol): Likewise. * nptl/pthread_mutexattr_setpshared.c (pthread_mutexattr_setpshared): Likewise. * nptl/pthread_mutexattr_setrobust.c (pthread_mutexattr_setrobust): Likewise. * nptl/pthread_mutexattr_settype.c (__pthread_mutexattr_settype): Likewise. * nptl/pthread_rwlock_destroy.c (__pthread_rwlock_destroy): Likewise. * nptl/pthread_rwlockattr_destroy.c (pthread_rwlockattr_destroy): Likewise. * nptl/pthread_rwlockattr_getkind_np.c (pthread_rwlockattr_getkind_np): Likewise. * nptl/pthread_rwlockattr_getpshared.c (pthread_rwlockattr_getpshared): Likewise. * nptl/pthread_rwlockattr_init.c (pthread_rwlockattr_init): Likewise. * nptl/pthread_rwlockattr_setkind_np.c (pthread_rwlockattr_setkind_np): Likewise. * nptl/pthread_rwlockattr_setpshared.c (pthread_rwlockattr_setpshared): Likewise. * nptl/pthread_setcancelstate.c (__pthread_setcancelstate): Likewise. * nptl/pthread_setcanceltype.c (__pthread_setcanceltype): Likewise. * nptl/pthread_setconcurrency.c (pthread_setconcurrency): Likewise. * nptl/pthread_setschedprio.c (pthread_setschedprio): Likewise. * nptl/pthread_setspecific.c (__pthread_setspecific): Likewise. * nptl/pthread_spin_destroy.c (pthread_spin_destroy): Likewise. * nptl/pthread_tryjoin.c (pthread_tryjoin_np): Likewise. * nptl/sem_close.c (sem_close): Likewise. * nptl/sem_destroy.c (__new_sem_destroy): Likewise. * nptl/sem_init.c (__old_sem_init): Likewise. * nptl/sigaction.c (__sigaction): Likewise. * nptl/unregister-atfork.c (__unregister_atfork): Likewise. * posix/_exit.c (_exit): Likewise. * posix/alarm.c (alarm): Likewise. * posix/confstr.c (confstr): Likewise. * posix/fpathconf.c (__fpathconf): Likewise. * posix/getgroups.c (__getgroups): Likewise. * posix/getpgid.c (__getpgid): Likewise. * posix/group_member.c (__group_member): Likewise. * posix/pathconf.c (__pathconf): Likewise. * posix/sched_getaffinity.c (sched_getaffinity): Likewise. * posix/sched_setaffinity.c (sched_setaffinity): Likewise. * posix/setgid.c (__setgid): Likewise. * posix/setpgid.c (__setpgid): Likewise. * posix/setuid.c (__setuid): Likewise. * posix/sleep.c (__sleep): Likewise. * posix/sysconf.c (__sysconf): Likewise. * posix/times.c (__times): Likewise. * posix/uname.c (__uname): Likewise. * posix/waitid.c (__waitid): Likewise. * pwd/getpw.c (__getpw): Likewise. * resolv/base64.c (b64_pton): Likewise. * resolv/gai_sigqueue.c (__gai_sigqueue): Likewise. * resolv/gethnamaddr.c (Dprintf): Likewise. (gethostbyname): Likewise. (gethostbyname2): Likewise. (gethostbyaddr): Likewise. (_sethtent): Likewise. (_gethtbyname): Likewise. (_gethtbyname2): Likewise. (_gethtbyaddr): Likewise. (map_v4v6_address): Likewise. (map_v4v6_hostent): Likewise. (addrsort): Likewise. (ht_sethostent): Likewise. (ht_gethostbyname): Likewise. (ht_gethostbyaddr): Likewise. * resolv/inet_net_ntop.c (inet_net_ntop): Likewise. (inet_net_ntop_ipv4): Likewise. * resolv/inet_neta.c (inet_neta): Likewise. * resolv/inet_ntop.c (inet_ntop): Likewise. (inet_ntop4): Likewise. (inet_ntop6): Likewise. * resolv/inet_pton.c (__inet_pton): Likewise. (inet_pton4): Likewise. (inet_pton6): Likewise. * resolv/res_debug.c (loc_aton): Likewise. (loc_ntoa): Likewise. * resource/getpriority.c (__getpriority): Likewise. * resource/getrusage.c (__getrusage): Likewise. * resource/nice.c (nice): Likewise. * resource/setpriority.c (__setpriority): Likewise. * resource/setrlimit64.c (setrlimit64): Likewise. * resource/vlimit.c (vlimit): Likewise. * resource/vtimes.c (vtimes): Likewise. * rt/aio_error.c (aio_error): Likewise. * rt/aio_return.c (aio_return): Likewise. * rt/aio_sigqueue.c (__aio_sigqueue): Likewise. * signal/kill.c (__kill): Likewise. * signal/killpg.c (killpg): Likewise. * signal/raise.c (raise): Likewise. * signal/sigaction.c (__sigaction): Likewise. * signal/sigaddset.c (sigaddset): Likewise. * signal/sigaltstack.c (sigaltstack): Likewise. * signal/sigandset.c (sigandset): Likewise. * signal/sigblock.c (__sigblock): Likewise. * signal/sigdelset.c (sigdelset): Likewise. * signal/sigempty.c (sigemptyset): Likewise. * signal/sigfillset.c (sigfillset): Likewise. * signal/sighold.c (sighold): Likewise. * signal/sigignore.c (sigignore): Likewise. * signal/sigintr.c (siginterrupt): Likewise. * signal/sigisempty.c (sigisemptyset): Likewise. * signal/sigismem.c (sigismember): Likewise. * signal/signal.c (signal): Likewise. * signal/sigorset.c (sigorset): Likewise. * signal/sigpause.c (__sigpause): Likewise. * signal/sigpending.c (sigpending): Likewise. * signal/sigprocmask.c (__sigprocmask): Likewise. * signal/sigrelse.c (sigrelse): Likewise. * signal/sigreturn.c (__sigreturn): Likewise. * signal/sigset.c (sigset): Likewise. * signal/sigsetmask.c (__sigsetmask): Likewise. * signal/sigstack.c (sigstack): Likewise. * signal/sigsuspend.c (__sigsuspend): Likewise. * signal/sigvec.c (sigvec_wrapper_handler): Likewise. * signal/sysv_signal.c (__sysv_signal): Likewise. * socket/accept.c (accept): Likewise. * socket/accept4.c (__libc_accept4): Likewise. * socket/bind.c (__bind): Likewise. * socket/connect.c (__connect): Likewise. * socket/getpeername.c (getpeername): Likewise. * socket/getsockname.c (__getsockname): Likewise. * socket/getsockopt.c (getsockopt): Likewise. * socket/listen.c (__listen): Likewise. * socket/recv.c (__recv): Likewise. * socket/recvmsg.c (__recvmsg): Likewise. * socket/send.c (__send): Likewise. * socket/sendmsg.c (__sendmsg): Likewise. * socket/shutdown.c (shutdown): Likewise. * socket/sockatmark.c (sockatmark): Likewise. * socket/socket.c (__socket): Likewise. * stdio-common/ctermid.c (ctermid): Likewise. * stdio-common/cuserid.c (cuserid): Likewise. * stdio-common/printf-prs.c (parse_printf_format): Likewise. * stdio-common/remove.c (remove): Likewise. * stdio-common/rename.c (rename): Likewise. * stdio-common/renameat.c (renameat): Likewise. * stdio-common/tempname.c (__gen_tempname): Likewise. * stdio-common/xbug.c (InitBuffer): Likewise. (AppendToBuffer): Likewise. (ReadFile): Likewise. * stdlib/a64l.c (a64l): Likewise. * stdlib/drand48_r.c (drand48_r): Likewise. * stdlib/getcontext.c (getcontext): Likewise. * stdlib/getenv.c (getenv): Likewise. * stdlib/l64a.c (l64a): Likewise. * stdlib/llabs.c (llabs): Likewise. * stdlib/lldiv.c (lldiv): Likewise. * stdlib/lrand48_r.c (lrand48_r): Likewise. * stdlib/mrand48_r.c (mrand48_r): Likewise. * stdlib/putenv.c (putenv): Likewise. * stdlib/random.c (__srandom): Likewise. (__initstate): Likewise. (__setstate): Likewise. * stdlib/random_r.c (__srandom_r): Likewise. (__setstate_r): Likewise. (__random_r): Likewise. * stdlib/secure-getenv.c (__libc_secure_getenv): Likewise. * stdlib/setcontext.c (setcontext): Likewise. * stdlib/setenv.c (setenv): Likewise. (unsetenv): Likewise. * stdlib/srand48.c (srand48): Likewise. * stdlib/srand48_r.c (__srand48_r): Likewise. * stdlib/swapcontext.c (swapcontext): Likewise. * stdlib/system.c (__libc_system): Likewise. * stdlib/tst-strtod.c (expand): Likewise. * stdlib/tst-strtol.c (expand): Likewise. * stdlib/tst-strtoll.c (expand): Likewise. * streams/fattach.c (fattach): Likewise. * streams/fdetach.c (fdetach): Likewise. * streams/getmsg.c (getmsg): Likewise. * streams/isastream.c (isastream): Likewise. * string/ffs.c (__ffs): Likewise. * string/ffsll.c (ffsll): Likewise. * string/memcmp.c (memcmp_common_alignment): Likewise. (memcmp_not_common_alignment): Likewise. (MEMCMP): Likewise. * string/memcpy.c (memcpy): Likewise. * string/memmove.c (MEMMOVE): Likewise. * string/memset.c (memset): Likewise. * string/rawmemchr.c (RAWMEMCHR): Likewise. * string/strchrnul.c (STRCHRNUL): Likewise. * string/strerror.c (strerror): Likewise. * string/strndup.c (__strndup): Likewise. * string/strverscmp.c (__strverscmp): Likewise. * sunrpc/clnt_raw.c (clntraw_freeres): Likewise. * sunrpc/clnt_tcp.c (clnttcp_geterr): Likewise. (clnttcp_freeres): Likewise. * sunrpc/clnt_unix.c (clntunix_freeres): Likewise. * sunrpc/pmap_prot.c (xdr_pmap): Likewise. * sunrpc/pmap_prot2.c (xdr_pmaplist): Likewise. * sunrpc/pmap_rmt.c (xdr_rmtcallres): Likewise. * sunrpc/rpc_prot.c (xdr_replymsg): Likewise. (xdr_callhdr): Likewise. * sunrpc/rpcinfo.c (udpping): Likewise. (tcpping): Likewise. (pstatus): Likewise. (pmapdump): Likewise. (brdcst): Likewise. (deletereg): Likewise. (getprognum): Likewise. (getvers): Likewise. (get_inet_address): Likewise. * sunrpc/svc_raw.c (svcraw_recv): Likewise. * sunrpc/svc_udp.c (svcudp_create): Likewise. (svcudp_stat): Likewise. (svcudp_recv): Likewise. (svcudp_reply): Likewise. (svcudp_getargs): Likewise. (svcudp_freeargs): Likewise. (svcudp_destroy): Likewise. * sunrpc/xdr.c (xdr_bytes): Likewise. (xdr_netobj): Likewise. (xdr_string): Likewise. (xdr_wrapstring): Likewise. * sunrpc/xdr_float.c (xdr_float): Likewise. (xdr_double): Likewise. * sunrpc/xdr_mem.c (xdrmem_setpos): Likewise. * sunrpc/xdr_ref.c (xdr_pointer): Likewise. * sysvipc/ftok.c (ftok): Likewise. * sysvipc/msgctl.c (msgctl): Likewise. * sysvipc/msgget.c (msgget): Likewise. * sysvipc/msgrcv.c (msgrcv): Likewise. * sysvipc/msgsnd.c (msgsnd): Likewise. * sysvipc/semget.c (semget): Likewise. * sysvipc/semop.c (semop): Likewise. * sysvipc/shmat.c (shmat): Likewise. * sysvipc/shmctl.c (shmctl): Likewise. * sysvipc/shmdt.c (shmdt): Likewise. * sysvipc/shmget.c (shmget): Likewise. * termios/cfmakeraw.c (cfmakeraw): Likewise. * termios/speed.c (cfgetospeed): Likewise. (cfgetispeed): Likewise. (cfsetospeed): Likewise. (cfsetispeed): Likewise. * termios/tcflow.c (tcflow): Likewise. * termios/tcflush.c (tcflush): Likewise. * termios/tcgetattr.c (__tcgetattr): Likewise. * termios/tcgetpgrp.c (tcgetpgrp): Likewise. * termios/tcgetsid.c (tcgetsid): Likewise. * termios/tcsendbrk.c (tcsendbreak): Likewise. * termios/tcsetpgrp.c (tcsetpgrp): Likewise. * time/adjtime.c (__adjtime): Likewise. * time/dysize.c (dysize): Likewise. * time/ftime.c (ftime): Likewise. * time/getitimer.c (__getitimer): Likewise. * time/gettimeofday.c (__gettimeofday): Likewise. * time/gmtime.c (__gmtime_r): Likewise. (gmtime): Likewise. * time/localtime.c (__localtime_r): Likewise. (localtime): Likewise. * time/offtime.c (__offtime): Likewise. * time/settimeofday.c (__settimeofday): Likewise. * time/stime.c (stime): Likewise. * time/strftime_l.c (tm_diff): Likewise. (iso_week_days): Likewise. * time/strptime.c (strptime): Likewise. * time/time.c (time): Likewise. * time/timespec_get.c (timespec_get): Likewise. * time/tzset.c (tzset_internal): Likewise. (compute_change): Likewise. (__tz_compute): Likewise. * wcsmbs/btowc.c (__btowc): Likewise. * wcsmbs/mbrlen.c (__mbrlen): Likewise. * wcsmbs/mbsinit.c (__mbsinit): Likewise. * wcsmbs/mbsrtowcs.c (__mbsrtowcs): Likewise. * wcsmbs/wcpcpy.c (__wcpcpy): Likewise. * wcsmbs/wcpncpy.c (__wcpncpy): Likewise. * wcsmbs/wcscat.c (__wcscat): Likewise. * wcsmbs/wcschrnul.c (__wcschrnul): Likewise. * wcsmbs/wcscmp.c (WCSCMP): Likewise. * wcsmbs/wcscpy.c (WCSCPY): Likewise. * wcsmbs/wcscspn.c (wcscspn): Likewise. * wcsmbs/wcsdup.c (wcsdup): Likewise. * wcsmbs/wcslen.c (__wcslen): Likewise. * wcsmbs/wcsncat.c (WCSNCAT): Likewise. * wcsmbs/wcsncmp.c (WCSNCMP): Likewise. * wcsmbs/wcsncpy.c (__wcsncpy): Likewise. * wcsmbs/wcsnlen.c (__wcsnlen): Likewise. * wcsmbs/wcspbrk.c (wcspbrk): Likewise. * wcsmbs/wcsrchr.c (WCSRCHR): Likewise. * wcsmbs/wcsspn.c (wcsspn): Likewise. * wcsmbs/wcsstr.c (wcsstr): Likewise. * wcsmbs/wcstok.c (wcstok): Likewise. * wcsmbs/wctob.c (wctob): Likewise. * wcsmbs/wmemchr.c (__wmemchr): Likewise. * wcsmbs/wmemcmp.c (WMEMCMP): Likewise. * wcsmbs/wmemcpy.c (__wmemcpy): Likewise. * wcsmbs/wmemmove.c (__wmemmove): Likewise. * wcsmbs/wmempcpy.c (__wmempcpy): Likewise. * wcsmbs/wmemset.c (__wmemset): Likewise. * wctype/wcfuncs.c (__towlower): Likewise. (__towupper): Likewise.
944 lines
24 KiB
C
944 lines
24 KiB
C
/*
|
|
* UFC-crypt: ultra fast crypt(3) implementation
|
|
*
|
|
* Copyright (C) 1991-2015 Free Software Foundation, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; see the file COPYING.LIB. If not,
|
|
* see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* @(#)crypt_util.c 2.56 12/20/96
|
|
*
|
|
* Support routines
|
|
*
|
|
*/
|
|
|
|
#ifdef DEBUG
|
|
#include <stdio.h>
|
|
#endif
|
|
#include <atomic.h>
|
|
#include <string.h>
|
|
|
|
#ifndef STATIC
|
|
#define STATIC static
|
|
#endif
|
|
|
|
#include "crypt-private.h"
|
|
|
|
/* Prototypes for local functions. */
|
|
#ifndef __GNU_LIBRARY__
|
|
void _ufc_clearmem (char *start, int cnt);
|
|
void _ufc_copymem (char *from, char *to, int cnt);
|
|
#endif
|
|
#ifdef _UFC_32_
|
|
STATIC void shuffle_sb (long32 *k, ufc_long saltbits);
|
|
#else
|
|
STATIC void shuffle_sb (long64 *k, ufc_long saltbits);
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Permutation done once on the 56 bit
|
|
* key derived from the original 8 byte ASCII key.
|
|
*/
|
|
static const int pc1[56] = {
|
|
57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18,
|
|
10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36,
|
|
63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22,
|
|
14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4
|
|
};
|
|
|
|
/*
|
|
* How much to rotate each 28 bit half of the pc1 permutated
|
|
* 56 bit key before using pc2 to give the i' key
|
|
*/
|
|
static const int rots[16] = {
|
|
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
|
|
};
|
|
|
|
/*
|
|
* Permutation giving the key
|
|
* of the i' DES round
|
|
*/
|
|
static const int pc2[48] = {
|
|
14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10,
|
|
23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2,
|
|
41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
|
|
44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
|
|
};
|
|
|
|
/*
|
|
* The E expansion table which selects
|
|
* bits from the 32 bit intermediate result.
|
|
*/
|
|
static const int esel[48] = {
|
|
32, 1, 2, 3, 4, 5, 4, 5, 6, 7, 8, 9,
|
|
8, 9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
|
|
16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
|
|
24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32, 1
|
|
};
|
|
|
|
/*
|
|
* Permutation done on the
|
|
* result of sbox lookups
|
|
*/
|
|
static const int perm32[32] = {
|
|
16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10,
|
|
2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25
|
|
};
|
|
|
|
/*
|
|
* The sboxes
|
|
*/
|
|
static const int sbox[8][4][16]= {
|
|
{ { 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7 },
|
|
{ 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8 },
|
|
{ 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0 },
|
|
{ 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 }
|
|
},
|
|
|
|
{ { 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10 },
|
|
{ 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5 },
|
|
{ 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15 },
|
|
{ 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 }
|
|
},
|
|
|
|
{ { 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8 },
|
|
{ 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1 },
|
|
{ 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7 },
|
|
{ 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 }
|
|
},
|
|
|
|
{ { 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15 },
|
|
{ 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9 },
|
|
{ 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4 },
|
|
{ 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 }
|
|
},
|
|
|
|
{ { 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9 },
|
|
{ 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6 },
|
|
{ 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14 },
|
|
{ 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 }
|
|
},
|
|
|
|
{ { 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11 },
|
|
{ 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8 },
|
|
{ 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6 },
|
|
{ 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 }
|
|
},
|
|
|
|
{ { 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1 },
|
|
{ 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6 },
|
|
{ 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2 },
|
|
{ 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 }
|
|
},
|
|
|
|
{ { 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7 },
|
|
{ 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2 },
|
|
{ 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8 },
|
|
{ 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 }
|
|
}
|
|
};
|
|
|
|
/*
|
|
* This is the initial
|
|
* permutation matrix
|
|
*/
|
|
static const int initial_perm[64] = {
|
|
58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
|
|
62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,
|
|
57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3,
|
|
61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7
|
|
};
|
|
|
|
/*
|
|
* This is the final
|
|
* permutation matrix
|
|
*/
|
|
static const int final_perm[64] = {
|
|
40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31,
|
|
38, 6, 46, 14, 54, 22, 62, 30, 37, 5, 45, 13, 53, 21, 61, 29,
|
|
36, 4, 44, 12, 52, 20, 60, 28, 35, 3, 43, 11, 51, 19, 59, 27,
|
|
34, 2, 42, 10, 50, 18, 58, 26, 33, 1, 41, 9, 49, 17, 57, 25
|
|
};
|
|
|
|
#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
|
|
#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
|
|
|
|
static const ufc_long BITMASK[24] = {
|
|
0x40000000, 0x20000000, 0x10000000, 0x08000000, 0x04000000, 0x02000000,
|
|
0x01000000, 0x00800000, 0x00400000, 0x00200000, 0x00100000, 0x00080000,
|
|
0x00004000, 0x00002000, 0x00001000, 0x00000800, 0x00000400, 0x00000200,
|
|
0x00000100, 0x00000080, 0x00000040, 0x00000020, 0x00000010, 0x00000008
|
|
};
|
|
|
|
static const unsigned char bytemask[8] = {
|
|
0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
|
|
};
|
|
|
|
static const ufc_long longmask[32] = {
|
|
0x80000000, 0x40000000, 0x20000000, 0x10000000,
|
|
0x08000000, 0x04000000, 0x02000000, 0x01000000,
|
|
0x00800000, 0x00400000, 0x00200000, 0x00100000,
|
|
0x00080000, 0x00040000, 0x00020000, 0x00010000,
|
|
0x00008000, 0x00004000, 0x00002000, 0x00001000,
|
|
0x00000800, 0x00000400, 0x00000200, 0x00000100,
|
|
0x00000080, 0x00000040, 0x00000020, 0x00000010,
|
|
0x00000008, 0x00000004, 0x00000002, 0x00000001
|
|
};
|
|
|
|
/*
|
|
* do_pc1: permform pc1 permutation in the key schedule generation.
|
|
*
|
|
* The first index is the byte number in the 8 byte ASCII key
|
|
* - second - - the two 28 bits halfs of the result
|
|
* - third - selects the 7 bits actually used of each byte
|
|
*
|
|
* The result is kept with 28 bit per 32 bit with the 4 most significant
|
|
* bits zero.
|
|
*/
|
|
static ufc_long do_pc1[8][2][128];
|
|
|
|
/*
|
|
* do_pc2: permform pc2 permutation in the key schedule generation.
|
|
*
|
|
* The first index is the septet number in the two 28 bit intermediate values
|
|
* - second - - - septet values
|
|
*
|
|
* Knowledge of the structure of the pc2 permutation is used.
|
|
*
|
|
* The result is kept with 28 bit per 32 bit with the 4 most significant
|
|
* bits zero.
|
|
*/
|
|
static ufc_long do_pc2[8][128];
|
|
|
|
/*
|
|
* eperm32tab: do 32 bit permutation and E selection
|
|
*
|
|
* The first index is the byte number in the 32 bit value to be permuted
|
|
* - second - is the value of this byte
|
|
* - third - selects the two 32 bit values
|
|
*
|
|
* The table is used and generated internally in init_des to speed it up
|
|
*/
|
|
static ufc_long eperm32tab[4][256][2];
|
|
|
|
/*
|
|
* efp: undo an extra e selection and do final
|
|
* permutation giving the DES result.
|
|
*
|
|
* Invoked 6 bit a time on two 48 bit values
|
|
* giving two 32 bit longs.
|
|
*/
|
|
static ufc_long efp[16][64][2];
|
|
|
|
/* Table with characters for base64 transformation. */
|
|
static const char b64t[64] =
|
|
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
|
|
|
/*
|
|
* For use by the old, non-reentrant routines
|
|
* (crypt/encrypt/setkey)
|
|
*/
|
|
struct crypt_data _ufc_foobar;
|
|
|
|
#ifdef __GNU_LIBRARY__
|
|
#include <libc-lock.h>
|
|
|
|
__libc_lock_define_initialized (static, _ufc_tables_lock)
|
|
#endif
|
|
|
|
#ifdef DEBUG
|
|
|
|
void
|
|
_ufc_prbits (ufc_long *a, int n)
|
|
{
|
|
ufc_long i, j, t, tmp;
|
|
n /= 8;
|
|
for(i = 0; i < n; i++) {
|
|
tmp=0;
|
|
for(j = 0; j < 8; j++) {
|
|
t=8*i+j;
|
|
tmp|=(a[t/24] & BITMASK[t % 24])?bytemask[j]:0;
|
|
}
|
|
(void)printf("%02x ",tmp);
|
|
}
|
|
printf(" ");
|
|
}
|
|
|
|
static void
|
|
_ufc_set_bits (ufc_long v, ufc_long *b)
|
|
{
|
|
ufc_long i;
|
|
*b = 0;
|
|
for(i = 0; i < 24; i++) {
|
|
if(v & longmask[8 + i])
|
|
*b |= BITMASK[i];
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifndef __GNU_LIBRARY__
|
|
/*
|
|
* Silly rewrites of 'bzero'/'memset'. I do so
|
|
* because some machines don't have
|
|
* bzero and some don't have memset.
|
|
*/
|
|
|
|
void
|
|
_ufc_clearmem (char *start, int cnt)
|
|
{
|
|
while(cnt--)
|
|
*start++ = '\0';
|
|
}
|
|
|
|
void
|
|
_ufc_copymem(from, to, cnt)
|
|
char *from, *to;
|
|
int cnt;
|
|
{
|
|
while(cnt--)
|
|
*to++ = *from++;
|
|
}
|
|
#else
|
|
#define _ufc_clearmem(start, cnt) memset(start, 0, cnt)
|
|
#define _ufc_copymem(from, to, cnt) memcpy(to, from, cnt)
|
|
#endif
|
|
|
|
/* lookup a 6 bit value in sbox */
|
|
|
|
#define s_lookup(i,s) sbox[(i)][(((s)>>4) & 0x2)|((s) & 0x1)][((s)>>1) & 0xf];
|
|
|
|
/*
|
|
* Initialize unit - may be invoked directly
|
|
* by fcrypt users.
|
|
*/
|
|
|
|
void
|
|
__init_des_r (struct crypt_data * __restrict __data)
|
|
{
|
|
int comes_from_bit;
|
|
int bit, sg;
|
|
ufc_long j;
|
|
ufc_long mask1, mask2;
|
|
int e_inverse[64];
|
|
static volatile int small_tables_initialized = 0;
|
|
|
|
#ifdef _UFC_32_
|
|
long32 *sb[4];
|
|
sb[0] = (long32*)__data->sb0; sb[1] = (long32*)__data->sb1;
|
|
sb[2] = (long32*)__data->sb2; sb[3] = (long32*)__data->sb3;
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
long64 *sb[4];
|
|
sb[0] = (long64*)__data->sb0; sb[1] = (long64*)__data->sb1;
|
|
sb[2] = (long64*)__data->sb2; sb[3] = (long64*)__data->sb3;
|
|
#endif
|
|
|
|
if(small_tables_initialized == 0) {
|
|
#ifdef __GNU_LIBRARY__
|
|
__libc_lock_lock (_ufc_tables_lock);
|
|
if(small_tables_initialized)
|
|
goto small_tables_done;
|
|
#endif
|
|
|
|
/*
|
|
* Create the do_pc1 table used
|
|
* to affect pc1 permutation
|
|
* when generating keys
|
|
*/
|
|
_ufc_clearmem((char*)do_pc1, (int)sizeof(do_pc1));
|
|
for(bit = 0; bit < 56; bit++) {
|
|
comes_from_bit = pc1[bit] - 1;
|
|
mask1 = bytemask[comes_from_bit % 8 + 1];
|
|
mask2 = longmask[bit % 28 + 4];
|
|
for(j = 0; j < 128; j++) {
|
|
if(j & mask1)
|
|
do_pc1[comes_from_bit / 8][bit / 28][j] |= mask2;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Create the do_pc2 table used
|
|
* to affect pc2 permutation when
|
|
* generating keys
|
|
*/
|
|
_ufc_clearmem((char*)do_pc2, (int)sizeof(do_pc2));
|
|
for(bit = 0; bit < 48; bit++) {
|
|
comes_from_bit = pc2[bit] - 1;
|
|
mask1 = bytemask[comes_from_bit % 7 + 1];
|
|
mask2 = BITMASK[bit % 24];
|
|
for(j = 0; j < 128; j++) {
|
|
if(j & mask1)
|
|
do_pc2[comes_from_bit / 7][j] |= mask2;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Now generate the table used to do combined
|
|
* 32 bit permutation and e expansion
|
|
*
|
|
* We use it because we have to permute 16384 32 bit
|
|
* longs into 48 bit in order to initialize sb.
|
|
*
|
|
* Looping 48 rounds per permutation becomes
|
|
* just too slow...
|
|
*
|
|
*/
|
|
|
|
_ufc_clearmem((char*)eperm32tab, (int)sizeof(eperm32tab));
|
|
for(bit = 0; bit < 48; bit++) {
|
|
ufc_long mask1,comes_from;
|
|
comes_from = perm32[esel[bit]-1]-1;
|
|
mask1 = bytemask[comes_from % 8];
|
|
for(j = 256; j--;) {
|
|
if(j & mask1)
|
|
eperm32tab[comes_from / 8][j][bit / 24] |= BITMASK[bit % 24];
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Create an inverse matrix for esel telling
|
|
* where to plug out bits if undoing it
|
|
*/
|
|
for(bit=48; bit--;) {
|
|
e_inverse[esel[bit] - 1 ] = bit;
|
|
e_inverse[esel[bit] - 1 + 32] = bit + 48;
|
|
}
|
|
|
|
/*
|
|
* create efp: the matrix used to
|
|
* undo the E expansion and effect final permutation
|
|
*/
|
|
_ufc_clearmem((char*)efp, (int)sizeof efp);
|
|
for(bit = 0; bit < 64; bit++) {
|
|
int o_bit, o_long;
|
|
ufc_long word_value, mask1, mask2;
|
|
int comes_from_f_bit, comes_from_e_bit;
|
|
int comes_from_word, bit_within_word;
|
|
|
|
/* See where bit i belongs in the two 32 bit long's */
|
|
o_long = bit / 32; /* 0..1 */
|
|
o_bit = bit % 32; /* 0..31 */
|
|
|
|
/*
|
|
* And find a bit in the e permutated value setting this bit.
|
|
*
|
|
* Note: the e selection may have selected the same bit several
|
|
* times. By the initialization of e_inverse, we only look
|
|
* for one specific instance.
|
|
*/
|
|
comes_from_f_bit = final_perm[bit] - 1; /* 0..63 */
|
|
comes_from_e_bit = e_inverse[comes_from_f_bit]; /* 0..95 */
|
|
comes_from_word = comes_from_e_bit / 6; /* 0..15 */
|
|
bit_within_word = comes_from_e_bit % 6; /* 0..5 */
|
|
|
|
mask1 = longmask[bit_within_word + 26];
|
|
mask2 = longmask[o_bit];
|
|
|
|
for(word_value = 64; word_value--;) {
|
|
if(word_value & mask1)
|
|
efp[comes_from_word][word_value][o_long] |= mask2;
|
|
}
|
|
}
|
|
atomic_write_barrier ();
|
|
small_tables_initialized = 1;
|
|
#ifdef __GNU_LIBRARY__
|
|
small_tables_done:
|
|
__libc_lock_unlock(_ufc_tables_lock);
|
|
#endif
|
|
} else
|
|
atomic_read_barrier ();
|
|
|
|
/*
|
|
* Create the sb tables:
|
|
*
|
|
* For each 12 bit segment of an 48 bit intermediate
|
|
* result, the sb table precomputes the two 4 bit
|
|
* values of the sbox lookups done with the two 6
|
|
* bit halves, shifts them to their proper place,
|
|
* sends them through perm32 and finally E expands
|
|
* them so that they are ready for the next
|
|
* DES round.
|
|
*
|
|
*/
|
|
|
|
if (__data->sb0 + sizeof (__data->sb0) == __data->sb1
|
|
&& __data->sb1 + sizeof (__data->sb1) == __data->sb2
|
|
&& __data->sb2 + sizeof (__data->sb2) == __data->sb3)
|
|
_ufc_clearmem(__data->sb0,
|
|
(int)sizeof(__data->sb0)
|
|
+ (int)sizeof(__data->sb1)
|
|
+ (int)sizeof(__data->sb2)
|
|
+ (int)sizeof(__data->sb3));
|
|
else {
|
|
_ufc_clearmem(__data->sb0, (int)sizeof(__data->sb0));
|
|
_ufc_clearmem(__data->sb1, (int)sizeof(__data->sb1));
|
|
_ufc_clearmem(__data->sb2, (int)sizeof(__data->sb2));
|
|
_ufc_clearmem(__data->sb3, (int)sizeof(__data->sb3));
|
|
}
|
|
|
|
for(sg = 0; sg < 4; sg++) {
|
|
int j1, j2;
|
|
int s1, s2;
|
|
|
|
for(j1 = 0; j1 < 64; j1++) {
|
|
s1 = s_lookup(2 * sg, j1);
|
|
for(j2 = 0; j2 < 64; j2++) {
|
|
ufc_long to_permute, inx;
|
|
|
|
s2 = s_lookup(2 * sg + 1, j2);
|
|
to_permute = (((ufc_long)s1 << 4) |
|
|
(ufc_long)s2) << (24 - 8 * (ufc_long)sg);
|
|
|
|
#ifdef _UFC_32_
|
|
inx = ((j1 << 6) | j2) << 1;
|
|
sb[sg][inx ] = eperm32tab[0][(to_permute >> 24) & 0xff][0];
|
|
sb[sg][inx+1] = eperm32tab[0][(to_permute >> 24) & 0xff][1];
|
|
sb[sg][inx ] |= eperm32tab[1][(to_permute >> 16) & 0xff][0];
|
|
sb[sg][inx+1] |= eperm32tab[1][(to_permute >> 16) & 0xff][1];
|
|
sb[sg][inx ] |= eperm32tab[2][(to_permute >> 8) & 0xff][0];
|
|
sb[sg][inx+1] |= eperm32tab[2][(to_permute >> 8) & 0xff][1];
|
|
sb[sg][inx ] |= eperm32tab[3][(to_permute) & 0xff][0];
|
|
sb[sg][inx+1] |= eperm32tab[3][(to_permute) & 0xff][1];
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
inx = ((j1 << 6) | j2);
|
|
sb[sg][inx] =
|
|
((long64)eperm32tab[0][(to_permute >> 24) & 0xff][0] << 32) |
|
|
(long64)eperm32tab[0][(to_permute >> 24) & 0xff][1];
|
|
sb[sg][inx] |=
|
|
((long64)eperm32tab[1][(to_permute >> 16) & 0xff][0] << 32) |
|
|
(long64)eperm32tab[1][(to_permute >> 16) & 0xff][1];
|
|
sb[sg][inx] |=
|
|
((long64)eperm32tab[2][(to_permute >> 8) & 0xff][0] << 32) |
|
|
(long64)eperm32tab[2][(to_permute >> 8) & 0xff][1];
|
|
sb[sg][inx] |=
|
|
((long64)eperm32tab[3][(to_permute) & 0xff][0] << 32) |
|
|
(long64)eperm32tab[3][(to_permute) & 0xff][1];
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
__data->current_saltbits = 0;
|
|
__data->current_salt[0] = 0;
|
|
__data->current_salt[1] = 0;
|
|
__data->initialized++;
|
|
}
|
|
|
|
void
|
|
__init_des (void)
|
|
{
|
|
__init_des_r(&_ufc_foobar);
|
|
}
|
|
|
|
/*
|
|
* Process the elements of the sb table permuting the
|
|
* bits swapped in the expansion by the current salt.
|
|
*/
|
|
|
|
#ifdef _UFC_32_
|
|
STATIC void
|
|
shuffle_sb (long32 *k, ufc_long saltbits)
|
|
{
|
|
ufc_long j;
|
|
long32 x;
|
|
for(j=4096; j--;) {
|
|
x = (k[0] ^ k[1]) & (long32)saltbits;
|
|
*k++ ^= x;
|
|
*k++ ^= x;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef _UFC_64_
|
|
STATIC void
|
|
shuffle_sb (long64 *k, ufc_long saltbits)
|
|
{
|
|
ufc_long j;
|
|
long64 x;
|
|
for(j=4096; j--;) {
|
|
x = ((*k >> 32) ^ *k) & (long64)saltbits;
|
|
*k++ ^= (x << 32) | x;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Return false iff C is in the specified alphabet for crypt salt.
|
|
*/
|
|
|
|
static bool
|
|
bad_for_salt (char c)
|
|
{
|
|
switch (c)
|
|
{
|
|
case '0' ... '9':
|
|
case 'A' ... 'Z':
|
|
case 'a' ... 'z':
|
|
case '.': case '/':
|
|
return false;
|
|
|
|
default:
|
|
return true;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Setup the unit for a new salt
|
|
* Hopefully we'll not see a new salt in each crypt call.
|
|
* Return false if an unexpected character was found in s[0] or s[1].
|
|
*/
|
|
|
|
bool
|
|
_ufc_setup_salt_r (const char *s, struct crypt_data * __restrict __data)
|
|
{
|
|
ufc_long i, j, saltbits;
|
|
char s0, s1;
|
|
|
|
if(__data->initialized == 0)
|
|
__init_des_r(__data);
|
|
|
|
s0 = s[0];
|
|
if(bad_for_salt (s0))
|
|
return false;
|
|
|
|
s1 = s[1];
|
|
if(bad_for_salt (s1))
|
|
return false;
|
|
|
|
if(s0 == __data->current_salt[0] && s1 == __data->current_salt[1])
|
|
return true;
|
|
|
|
__data->current_salt[0] = s0;
|
|
__data->current_salt[1] = s1;
|
|
|
|
/*
|
|
* This is the only crypt change to DES:
|
|
* entries are swapped in the expansion table
|
|
* according to the bits set in the salt.
|
|
*/
|
|
saltbits = 0;
|
|
for(i = 0; i < 2; i++) {
|
|
long c=ascii_to_bin(s[i]);
|
|
for(j = 0; j < 6; j++) {
|
|
if((c >> j) & 0x1)
|
|
saltbits |= BITMASK[6 * i + j];
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Permute the sb table values
|
|
* to reflect the changed e
|
|
* selection table
|
|
*/
|
|
#ifdef _UFC_32_
|
|
#define LONGG long32*
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
#define LONGG long64*
|
|
#endif
|
|
|
|
shuffle_sb((LONGG)__data->sb0, __data->current_saltbits ^ saltbits);
|
|
shuffle_sb((LONGG)__data->sb1, __data->current_saltbits ^ saltbits);
|
|
shuffle_sb((LONGG)__data->sb2, __data->current_saltbits ^ saltbits);
|
|
shuffle_sb((LONGG)__data->sb3, __data->current_saltbits ^ saltbits);
|
|
|
|
__data->current_saltbits = saltbits;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
_ufc_mk_keytab_r (const char *key, struct crypt_data * __restrict __data)
|
|
{
|
|
ufc_long v1, v2, *k1;
|
|
int i;
|
|
#ifdef _UFC_32_
|
|
long32 v, *k2;
|
|
k2 = (long32*)__data->keysched;
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
long64 v, *k2;
|
|
k2 = (long64*)__data->keysched;
|
|
#endif
|
|
|
|
v1 = v2 = 0; k1 = &do_pc1[0][0][0];
|
|
for(i = 8; i--;) {
|
|
v1 |= k1[*key & 0x7f]; k1 += 128;
|
|
v2 |= k1[*key++ & 0x7f]; k1 += 128;
|
|
}
|
|
|
|
for(i = 0; i < 16; i++) {
|
|
k1 = &do_pc2[0][0];
|
|
|
|
v1 = (v1 << rots[i]) | (v1 >> (28 - rots[i]));
|
|
v = k1[(v1 >> 21) & 0x7f]; k1 += 128;
|
|
v |= k1[(v1 >> 14) & 0x7f]; k1 += 128;
|
|
v |= k1[(v1 >> 7) & 0x7f]; k1 += 128;
|
|
v |= k1[(v1 ) & 0x7f]; k1 += 128;
|
|
|
|
#ifdef _UFC_32_
|
|
*k2++ = (v | 0x00008000);
|
|
v = 0;
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
v = (v << 32);
|
|
#endif
|
|
|
|
v2 = (v2 << rots[i]) | (v2 >> (28 - rots[i]));
|
|
v |= k1[(v2 >> 21) & 0x7f]; k1 += 128;
|
|
v |= k1[(v2 >> 14) & 0x7f]; k1 += 128;
|
|
v |= k1[(v2 >> 7) & 0x7f]; k1 += 128;
|
|
v |= k1[(v2 ) & 0x7f];
|
|
|
|
#ifdef _UFC_32_
|
|
*k2++ = (v | 0x00008000);
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
*k2++ = v | 0x0000800000008000l;
|
|
#endif
|
|
}
|
|
|
|
__data->direction = 0;
|
|
}
|
|
|
|
/*
|
|
* Undo an extra E selection and do final permutations
|
|
*/
|
|
|
|
void
|
|
_ufc_dofinalperm_r (ufc_long *res, struct crypt_data * __restrict __data)
|
|
{
|
|
ufc_long v1, v2, x;
|
|
ufc_long l1,l2,r1,r2;
|
|
|
|
l1 = res[0]; l2 = res[1];
|
|
r1 = res[2]; r2 = res[3];
|
|
|
|
x = (l1 ^ l2) & __data->current_saltbits; l1 ^= x; l2 ^= x;
|
|
x = (r1 ^ r2) & __data->current_saltbits; r1 ^= x; r2 ^= x;
|
|
|
|
v1=v2=0; l1 >>= 3; l2 >>= 3; r1 >>= 3; r2 >>= 3;
|
|
|
|
v1 |= efp[15][ r2 & 0x3f][0]; v2 |= efp[15][ r2 & 0x3f][1];
|
|
v1 |= efp[14][(r2 >>= 6) & 0x3f][0]; v2 |= efp[14][ r2 & 0x3f][1];
|
|
v1 |= efp[13][(r2 >>= 10) & 0x3f][0]; v2 |= efp[13][ r2 & 0x3f][1];
|
|
v1 |= efp[12][(r2 >>= 6) & 0x3f][0]; v2 |= efp[12][ r2 & 0x3f][1];
|
|
|
|
v1 |= efp[11][ r1 & 0x3f][0]; v2 |= efp[11][ r1 & 0x3f][1];
|
|
v1 |= efp[10][(r1 >>= 6) & 0x3f][0]; v2 |= efp[10][ r1 & 0x3f][1];
|
|
v1 |= efp[ 9][(r1 >>= 10) & 0x3f][0]; v2 |= efp[ 9][ r1 & 0x3f][1];
|
|
v1 |= efp[ 8][(r1 >>= 6) & 0x3f][0]; v2 |= efp[ 8][ r1 & 0x3f][1];
|
|
|
|
v1 |= efp[ 7][ l2 & 0x3f][0]; v2 |= efp[ 7][ l2 & 0x3f][1];
|
|
v1 |= efp[ 6][(l2 >>= 6) & 0x3f][0]; v2 |= efp[ 6][ l2 & 0x3f][1];
|
|
v1 |= efp[ 5][(l2 >>= 10) & 0x3f][0]; v2 |= efp[ 5][ l2 & 0x3f][1];
|
|
v1 |= efp[ 4][(l2 >>= 6) & 0x3f][0]; v2 |= efp[ 4][ l2 & 0x3f][1];
|
|
|
|
v1 |= efp[ 3][ l1 & 0x3f][0]; v2 |= efp[ 3][ l1 & 0x3f][1];
|
|
v1 |= efp[ 2][(l1 >>= 6) & 0x3f][0]; v2 |= efp[ 2][ l1 & 0x3f][1];
|
|
v1 |= efp[ 1][(l1 >>= 10) & 0x3f][0]; v2 |= efp[ 1][ l1 & 0x3f][1];
|
|
v1 |= efp[ 0][(l1 >>= 6) & 0x3f][0]; v2 |= efp[ 0][ l1 & 0x3f][1];
|
|
|
|
res[0] = v1; res[1] = v2;
|
|
}
|
|
|
|
/*
|
|
* crypt only: convert from 64 bit to 11 bit ASCII
|
|
* prefixing with the salt
|
|
*/
|
|
|
|
void
|
|
_ufc_output_conversion_r(v1, v2, salt, __data)
|
|
ufc_long v1, v2;
|
|
const char *salt;
|
|
struct crypt_data * __restrict __data;
|
|
{
|
|
int i, s, shf;
|
|
|
|
__data->crypt_3_buf[0] = salt[0];
|
|
__data->crypt_3_buf[1] = salt[1] ? salt[1] : salt[0];
|
|
|
|
for(i = 0; i < 5; i++) {
|
|
shf = (26 - 6 * i); /* to cope with MSC compiler bug */
|
|
__data->crypt_3_buf[i + 2] = bin_to_ascii((v1 >> shf) & 0x3f);
|
|
}
|
|
|
|
s = (v2 & 0xf) << 2;
|
|
v2 = (v2 >> 2) | ((v1 & 0x3) << 30);
|
|
|
|
for(i = 5; i < 10; i++) {
|
|
shf = (56 - 6 * i);
|
|
__data->crypt_3_buf[i + 2] = bin_to_ascii((v2 >> shf) & 0x3f);
|
|
}
|
|
|
|
__data->crypt_3_buf[12] = bin_to_ascii(s);
|
|
__data->crypt_3_buf[13] = 0;
|
|
}
|
|
|
|
|
|
/*
|
|
* UNIX encrypt function. Takes a bitvector
|
|
* represented by one byte per bit and
|
|
* encrypt/decrypt according to edflag
|
|
*/
|
|
|
|
void
|
|
__encrypt_r(__block, __edflag, __data)
|
|
char *__block;
|
|
int __edflag;
|
|
struct crypt_data * __restrict __data;
|
|
{
|
|
ufc_long l1, l2, r1, r2, res[4];
|
|
int i;
|
|
#ifdef _UFC_32_
|
|
long32 *kt;
|
|
kt = (long32*)__data->keysched;
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
long64 *kt;
|
|
kt = (long64*)__data->keysched;
|
|
#endif
|
|
|
|
/*
|
|
* Undo any salt changes to E expansion
|
|
*/
|
|
_ufc_setup_salt_r("..", __data);
|
|
|
|
/*
|
|
* Reverse key table if
|
|
* changing operation (encrypt/decrypt)
|
|
*/
|
|
if((__edflag == 0) != (__data->direction == 0)) {
|
|
for(i = 0; i < 8; i++) {
|
|
#ifdef _UFC_32_
|
|
long32 x;
|
|
x = kt[2 * (15-i)];
|
|
kt[2 * (15-i)] = kt[2 * i];
|
|
kt[2 * i] = x;
|
|
|
|
x = kt[2 * (15-i) + 1];
|
|
kt[2 * (15-i) + 1] = kt[2 * i + 1];
|
|
kt[2 * i + 1] = x;
|
|
#endif
|
|
#ifdef _UFC_64_
|
|
long64 x;
|
|
x = kt[15-i];
|
|
kt[15-i] = kt[i];
|
|
kt[i] = x;
|
|
#endif
|
|
}
|
|
__data->direction = __edflag;
|
|
}
|
|
|
|
/*
|
|
* Do initial permutation + E expansion
|
|
*/
|
|
i = 0;
|
|
for(l1 = 0; i < 24; i++) {
|
|
if(__block[initial_perm[esel[i]-1]-1])
|
|
l1 |= BITMASK[i];
|
|
}
|
|
for(l2 = 0; i < 48; i++) {
|
|
if(__block[initial_perm[esel[i]-1]-1])
|
|
l2 |= BITMASK[i-24];
|
|
}
|
|
|
|
i = 0;
|
|
for(r1 = 0; i < 24; i++) {
|
|
if(__block[initial_perm[esel[i]-1+32]-1])
|
|
r1 |= BITMASK[i];
|
|
}
|
|
for(r2 = 0; i < 48; i++) {
|
|
if(__block[initial_perm[esel[i]-1+32]-1])
|
|
r2 |= BITMASK[i-24];
|
|
}
|
|
|
|
/*
|
|
* Do DES inner loops + final conversion
|
|
*/
|
|
res[0] = l1; res[1] = l2;
|
|
res[2] = r1; res[3] = r2;
|
|
_ufc_doit_r((ufc_long)1, __data, &res[0]);
|
|
|
|
/*
|
|
* Do final permutations
|
|
*/
|
|
_ufc_dofinalperm_r(res, __data);
|
|
|
|
/*
|
|
* And convert to bit array
|
|
*/
|
|
l1 = res[0]; r1 = res[1];
|
|
for(i = 0; i < 32; i++) {
|
|
*__block++ = (l1 & longmask[i]) != 0;
|
|
}
|
|
for(i = 0; i < 32; i++) {
|
|
*__block++ = (r1 & longmask[i]) != 0;
|
|
}
|
|
}
|
|
weak_alias (__encrypt_r, encrypt_r)
|
|
|
|
void
|
|
encrypt (char *__block, int __edflag)
|
|
{
|
|
__encrypt_r(__block, __edflag, &_ufc_foobar);
|
|
}
|
|
|
|
|
|
/*
|
|
* UNIX setkey function. Take a 64 bit DES
|
|
* key and setup the machinery.
|
|
*/
|
|
|
|
void
|
|
__setkey_r (const char *__key, struct crypt_data * __restrict __data)
|
|
{
|
|
int i,j;
|
|
unsigned char c;
|
|
unsigned char ktab[8];
|
|
|
|
_ufc_setup_salt_r("..", __data); /* be sure we're initialized */
|
|
|
|
for(i = 0; i < 8; i++) {
|
|
for(j = 0, c = 0; j < 8; j++)
|
|
c = c << 1 | *__key++;
|
|
ktab[i] = c >> 1;
|
|
}
|
|
_ufc_mk_keytab_r((char *) ktab, __data);
|
|
}
|
|
weak_alias (__setkey_r, setkey_r)
|
|
|
|
void
|
|
setkey (const char *__key)
|
|
{
|
|
__setkey_r(__key, &_ufc_foobar);
|
|
}
|
|
|
|
void
|
|
__b64_from_24bit (char **cp, int *buflen,
|
|
unsigned int b2, unsigned int b1, unsigned int b0,
|
|
int n)
|
|
{
|
|
unsigned int w = (b2 << 16) | (b1 << 8) | b0;
|
|
while (n-- > 0 && (*buflen) > 0)
|
|
{
|
|
*(*cp)++ = b64t[w & 0x3f];
|
|
--(*buflen);
|
|
w >>= 6;
|
|
}
|
|
}
|