diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-02-13 15:53:13 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-02-13 15:53:13 +0100 |
commit | dfd5ef42cf6b68bd7ee7b522ac3c9a55cd54c889 (patch) | |
tree | 39061cd184fac30537df44c379a4ecb18d119bc6 /openssl/ssl/s3_srvr.c | |
parent | b91aedc11393608ba7fb38f358c35ece662fd1b7 (diff) |
Move to new gradle project structure (drop Eclipse support, add initial remote demo project)
--HG--
rename : build.gradle => main/build.gradle
rename : jni/Android.mk => main/jni/Android.mk
rename : jni/Application.mk => main/jni/Application.mk
rename : jni/dummy.cpp => main/jni/dummy.cpp
rename : jni/jbcrypto.cpp => main/jni/jbcrypto.cpp
rename : jni/jniglue.c => main/jni/jniglue.c
rename : jni/jniglue.h => main/jni/jniglue.h
rename : jni/minivpn.c => main/jni/minivpn.c
rename : lzo/AUTHORS => main/lzo/AUTHORS
rename : lzo/Android.mk => main/lzo/Android.mk
rename : lzo/B/00README.TXT => main/lzo/B/00README.TXT
rename : lzo/B/clean.bat => main/lzo/B/clean.bat
rename : lzo/B/done.bat => main/lzo/B/done.bat
rename : lzo/B/dos16/bc.bat => main/lzo/B/dos16/bc.bat
rename : lzo/B/dos16/bc.rsp => main/lzo/B/dos16/bc.rsp
rename : lzo/B/dos16/bc_286.bat => main/lzo/B/dos16/bc_286.bat
rename : lzo/B/dos16/bc_pp.bat => main/lzo/B/dos16/bc_pp.bat
rename : lzo/B/dos16/dm.bat => main/lzo/B/dos16/dm.bat
rename : lzo/B/dos16/mc.bat => main/lzo/B/dos16/mc.bat
rename : lzo/B/dos16/mc_qc.bat => main/lzo/B/dos16/mc_qc.bat
rename : lzo/B/dos16/qc.bat => main/lzo/B/dos16/qc.bat
rename : lzo/B/dos16/sc.bat => main/lzo/B/dos16/sc.bat
rename : lzo/B/dos16/tc.bat => main/lzo/B/dos16/tc.bat
rename : lzo/B/dos16/vc.bat => main/lzo/B/dos16/vc.bat
rename : lzo/B/dos16/vc_qc.bat => main/lzo/B/dos16/vc_qc.bat
rename : lzo/B/dos16/wc.bat => main/lzo/B/dos16/wc.bat
rename : lzo/B/dos16/wc.rsp => main/lzo/B/dos16/wc.rsp
rename : lzo/B/dos32/bc_pp.bat => main/lzo/B/dos32/bc_pp.bat
rename : lzo/B/dos32/dj2.bat => main/lzo/B/dos32/dj2.bat
rename : lzo/B/dos32/dj2.opt => main/lzo/B/dos32/dj2.opt
rename : lzo/B/dos32/dm.bat => main/lzo/B/dos32/dm.bat
rename : lzo/B/dos32/emx.bat => main/lzo/B/dos32/emx.bat
rename : lzo/B/dos32/highc.bat => main/lzo/B/dos32/highc.bat
rename : lzo/B/dos32/highc.rsp => main/lzo/B/dos32/highc.rsp
rename : lzo/B/dos32/ndp.bat => main/lzo/B/dos32/ndp.bat
rename : lzo/B/dos32/ndp.rsp => main/lzo/B/dos32/ndp.rsp
rename : lzo/B/dos32/sc.bat => main/lzo/B/dos32/sc.bat
rename : lzo/B/dos32/wc.bat => main/lzo/B/dos32/wc.bat
rename : lzo/B/dos32/zc.bat => main/lzo/B/dos32/zc.bat
rename : lzo/B/generic/Makefile => main/lzo/B/generic/Makefile
rename : lzo/B/generic/build.sh => main/lzo/B/generic/build.sh
rename : lzo/B/generic/build_freestanding.sh => main/lzo/B/generic/build_freestanding.sh
rename : lzo/B/generic/build_gcc.sh => main/lzo/B/generic/build_gcc.sh
rename : lzo/B/generic/clean.sh => main/lzo/B/generic/clean.sh
rename : lzo/B/os2/emx.bat => main/lzo/B/os2/emx.bat
rename : lzo/B/os2/wc.bat => main/lzo/B/os2/wc.bat
rename : lzo/B/os2/zc.bat => main/lzo/B/os2/zc.bat
rename : lzo/B/os2_16/mc.bat => main/lzo/B/os2_16/mc.bat
rename : lzo/B/os2_16/wc.bat => main/lzo/B/os2_16/wc.bat
rename : lzo/B/prepare.bat => main/lzo/B/prepare.bat
rename : lzo/B/src.rsp => main/lzo/B/src.rsp
rename : lzo/B/unset.bat => main/lzo/B/unset.bat
rename : lzo/B/win16/bc.bat => main/lzo/B/win16/bc.bat
rename : lzo/B/win16/dm.bat => main/lzo/B/win16/dm.bat
rename : lzo/B/win16/mc.bat => main/lzo/B/win16/mc.bat
rename : lzo/B/win16/sc.bat => main/lzo/B/win16/sc.bat
rename : lzo/B/win16/vc.bat => main/lzo/B/win16/vc.bat
rename : lzo/B/win16/wc.bat => main/lzo/B/win16/wc.bat
rename : lzo/B/win32/bc.bat => main/lzo/B/win32/bc.bat
rename : lzo/B/win32/bc.rsp => main/lzo/B/win32/bc.rsp
rename : lzo/B/win32/cygwin.bat => main/lzo/B/win32/cygwin.bat
rename : lzo/B/win32/cygwin.rsp => main/lzo/B/win32/cygwin.rsp
rename : lzo/B/win32/dm.bat => main/lzo/B/win32/dm.bat
rename : lzo/B/win32/ic.bat => main/lzo/B/win32/ic.bat
rename : lzo/B/win32/lccwin32.bat => main/lzo/B/win32/lccwin32.bat
rename : lzo/B/win32/mingw.bat => main/lzo/B/win32/mingw.bat
rename : lzo/B/win32/mwerks.bat => main/lzo/B/win32/mwerks.bat
rename : lzo/B/win32/pellesc.bat => main/lzo/B/win32/pellesc.bat
rename : lzo/B/win32/pgi.bat => main/lzo/B/win32/pgi.bat
rename : lzo/B/win32/pw32.bat => main/lzo/B/win32/pw32.bat
rename : lzo/B/win32/rsxnt.bat => main/lzo/B/win32/rsxnt.bat
rename : lzo/B/win32/sc.bat => main/lzo/B/win32/sc.bat
rename : lzo/B/win32/vc.bat => main/lzo/B/win32/vc.bat
rename : lzo/B/win32/vc.rsp => main/lzo/B/win32/vc.rsp
rename : lzo/B/win32/vc_dll.bat => main/lzo/B/win32/vc_dll.bat
rename : lzo/B/win32/vc_dll.def => main/lzo/B/win32/vc_dll.def
rename : lzo/B/win32/wc.bat => main/lzo/B/win32/wc.bat
rename : lzo/B/win32/wc.rsp => main/lzo/B/win32/wc.rsp
rename : lzo/B/win64/ic.bat => main/lzo/B/win64/ic.bat
rename : lzo/B/win64/ic_dll.bat => main/lzo/B/win64/ic_dll.bat
rename : lzo/B/win64/vc.bat => main/lzo/B/win64/vc.bat
rename : lzo/B/win64/vc.rsp => main/lzo/B/win64/vc.rsp
rename : lzo/B/win64/vc_dll.bat => main/lzo/B/win64/vc_dll.bat
rename : lzo/B/win64/vc_dll.def => main/lzo/B/win64/vc_dll.def
rename : lzo/BUGS => main/lzo/BUGS
rename : lzo/COPYING => main/lzo/COPYING
rename : lzo/ChangeLog => main/lzo/ChangeLog
rename : lzo/INSTALL => main/lzo/INSTALL
rename : lzo/Makefile => main/lzo/Makefile
rename : lzo/Makefile.am => main/lzo/Makefile.am
rename : lzo/Makefile.in => main/lzo/Makefile.in
rename : lzo/NEWS => main/lzo/NEWS
rename : lzo/README => main/lzo/README
rename : lzo/README.ANDROID => main/lzo/README.ANDROID
rename : lzo/THANKS => main/lzo/THANKS
rename : lzo/aclocal.m4 => main/lzo/aclocal.m4
rename : lzo/asm/i386/00README.TXT => main/lzo/asm/i386/00README.TXT
rename : lzo/asm/i386/obj/coff32/lzo1c_s1.o => main/lzo/asm/i386/obj/coff32/lzo1c_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1c_s2.o => main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
rename : lzo/asm/i386/obj/coff32/lzo1f_f1.o => main/lzo/asm/i386/obj/coff32/lzo1f_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1f_f2.o => main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1x_f1.o => main/lzo/asm/i386/obj/coff32/lzo1x_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1x_f2.o => main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1x_s1.o => main/lzo/asm/i386/obj/coff32/lzo1x_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1x_s2.o => main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
rename : lzo/asm/i386/obj/coff32/lzo1y_f1.o => main/lzo/asm/i386/obj/coff32/lzo1y_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1y_f2.o => main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1y_s1.o => main/lzo/asm/i386/obj/coff32/lzo1y_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1y_s2.o => main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1c_s1.o => main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1c_s2.o => main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1f_f1.o => main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1f_f2.o => main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1x_f1.o => main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1x_f2.o => main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1x_s1.o => main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1x_s2.o => main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1y_f1.o => main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1y_f2.o => main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1y_s1.o => main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1y_s2.o => main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
rename : lzo/asm/i386/obj/omf32/lzo1c_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1c_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
rename : lzo/asm/i386/obj/omf32/lzo1f_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1f_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1c_s1.obj => main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1c_s2.obj => main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1f_f1.obj => main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1f_f2.obj => main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1x_f1.obj => main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1x_f2.obj => main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1x_s1.obj => main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1x_s2.obj => main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1y_f1.obj => main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1y_f2.obj => main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1y_s1.obj => main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1y_s2.obj => main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
rename : lzo/asm/i386/src/enter.ash => main/lzo/asm/i386/src/enter.ash
rename : lzo/asm/i386/src/leave.ash => main/lzo/asm/i386/src/leave.ash
rename : lzo/asm/i386/src/lzo1c_d.ash => main/lzo/asm/i386/src/lzo1c_d.ash
rename : lzo/asm/i386/src/lzo1c_s1.S => main/lzo/asm/i386/src/lzo1c_s1.S
rename : lzo/asm/i386/src/lzo1c_s2.S => main/lzo/asm/i386/src/lzo1c_s2.S
rename : lzo/asm/i386/src/lzo1f_d.ash => main/lzo/asm/i386/src/lzo1f_d.ash
rename : lzo/asm/i386/src/lzo1f_f1.S => main/lzo/asm/i386/src/lzo1f_f1.S
rename : lzo/asm/i386/src/lzo1f_f2.S => main/lzo/asm/i386/src/lzo1f_f2.S
rename : lzo/asm/i386/src/lzo1x_d.ash => main/lzo/asm/i386/src/lzo1x_d.ash
rename : lzo/asm/i386/src/lzo1x_f1.S => main/lzo/asm/i386/src/lzo1x_f1.S
rename : lzo/asm/i386/src/lzo1x_f2.S => main/lzo/asm/i386/src/lzo1x_f2.S
rename : lzo/asm/i386/src/lzo1x_s1.S => main/lzo/asm/i386/src/lzo1x_s1.S
rename : lzo/asm/i386/src/lzo1x_s2.S => main/lzo/asm/i386/src/lzo1x_s2.S
rename : lzo/asm/i386/src/lzo1y_f1.S => main/lzo/asm/i386/src/lzo1y_f1.S
rename : lzo/asm/i386/src/lzo1y_f2.S => main/lzo/asm/i386/src/lzo1y_f2.S
rename : lzo/asm/i386/src/lzo1y_s1.S => main/lzo/asm/i386/src/lzo1y_s1.S
rename : lzo/asm/i386/src/lzo1y_s2.S => main/lzo/asm/i386/src/lzo1y_s2.S
rename : lzo/asm/i386/src/lzo_asm.h => main/lzo/asm/i386/src/lzo_asm.h
rename : lzo/asm/i386/src_gas/all/asm_all.S => main/lzo/asm/i386/src_gas/all/asm_all.S
rename : lzo/asm/i386/src_gas/asminit.def => main/lzo/asm/i386/src_gas/asminit.def
rename : lzo/asm/i386/src_gas/lzo1c_s1.S => main/lzo/asm/i386/src_gas/lzo1c_s1.S
rename : lzo/asm/i386/src_gas/lzo1c_s2.S => main/lzo/asm/i386/src_gas/lzo1c_s2.S
rename : lzo/asm/i386/src_gas/lzo1f_f1.S => main/lzo/asm/i386/src_gas/lzo1f_f1.S
rename : lzo/asm/i386/src_gas/lzo1f_f2.S => main/lzo/asm/i386/src_gas/lzo1f_f2.S
rename : lzo/asm/i386/src_gas/lzo1x_f1.S => main/lzo/asm/i386/src_gas/lzo1x_f1.S
rename : lzo/asm/i386/src_gas/lzo1x_f2.S => main/lzo/asm/i386/src_gas/lzo1x_f2.S
rename : lzo/asm/i386/src_gas/lzo1x_s1.S => main/lzo/asm/i386/src_gas/lzo1x_s1.S
rename : lzo/asm/i386/src_gas/lzo1x_s2.S => main/lzo/asm/i386/src_gas/lzo1x_s2.S
rename : lzo/asm/i386/src_gas/lzo1y_f1.S => main/lzo/asm/i386/src_gas/lzo1y_f1.S
rename : lzo/asm/i386/src_gas/lzo1y_f2.S => main/lzo/asm/i386/src_gas/lzo1y_f2.S
rename : lzo/asm/i386/src_gas/lzo1y_s1.S => main/lzo/asm/i386/src_gas/lzo1y_s1.S
rename : lzo/asm/i386/src_gas/lzo1y_s2.S => main/lzo/asm/i386/src_gas/lzo1y_s2.S
rename : lzo/asm/i386/src_masm/all/asm_all.asm => main/lzo/asm/i386/src_masm/all/asm_all.asm
rename : lzo/asm/i386/src_masm/asminit.def => main/lzo/asm/i386/src_masm/asminit.def
rename : lzo/asm/i386/src_masm/lzo1c_s1.asm => main/lzo/asm/i386/src_masm/lzo1c_s1.asm
rename : lzo/asm/i386/src_masm/lzo1c_s2.asm => main/lzo/asm/i386/src_masm/lzo1c_s2.asm
rename : lzo/asm/i386/src_masm/lzo1f_f1.asm => main/lzo/asm/i386/src_masm/lzo1f_f1.asm
rename : lzo/asm/i386/src_masm/lzo1f_f2.asm => main/lzo/asm/i386/src_masm/lzo1f_f2.asm
rename : lzo/asm/i386/src_masm/lzo1x_f1.asm => main/lzo/asm/i386/src_masm/lzo1x_f1.asm
rename : lzo/asm/i386/src_masm/lzo1x_f2.asm => main/lzo/asm/i386/src_masm/lzo1x_f2.asm
rename : lzo/asm/i386/src_masm/lzo1x_s1.asm => main/lzo/asm/i386/src_masm/lzo1x_s1.asm
rename : lzo/asm/i386/src_masm/lzo1x_s2.asm => main/lzo/asm/i386/src_masm/lzo1x_s2.asm
rename : lzo/asm/i386/src_masm/lzo1y_f1.asm => main/lzo/asm/i386/src_masm/lzo1y_f1.asm
rename : lzo/asm/i386/src_masm/lzo1y_f2.asm => main/lzo/asm/i386/src_masm/lzo1y_f2.asm
rename : lzo/asm/i386/src_masm/lzo1y_s1.asm => main/lzo/asm/i386/src_masm/lzo1y_s1.asm
rename : lzo/asm/i386/src_masm/lzo1y_s2.asm => main/lzo/asm/i386/src_masm/lzo1y_s2.asm
rename : lzo/asm/i386/src_nasm/all/asm_all.asm => main/lzo/asm/i386/src_nasm/all/asm_all.asm
rename : lzo/asm/i386/src_nasm/asminit.def => main/lzo/asm/i386/src_nasm/asminit.def
rename : lzo/asm/i386/src_nasm/lzo1c_s1.asm => main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1c_s2.asm => main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
rename : lzo/asm/i386/src_nasm/lzo1f_f1.asm => main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1f_f2.asm => main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1x_f1.asm => main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1x_f2.asm => main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1x_s1.asm => main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1x_s2.asm => main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
rename : lzo/asm/i386/src_nasm/lzo1y_f1.asm => main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1y_f2.asm => main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1y_s1.asm => main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1y_s2.asm => main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
rename : lzo/autoconf/compile => main/lzo/autoconf/compile
rename : lzo/autoconf/config.guess => main/lzo/autoconf/config.guess
rename : lzo/autoconf/config.rpath => main/lzo/autoconf/config.rpath
rename : lzo/autoconf/config.sub => main/lzo/autoconf/config.sub
rename : lzo/autoconf/depcomp => main/lzo/autoconf/depcomp
rename : lzo/autoconf/install-sh => main/lzo/autoconf/install-sh
rename : lzo/autoconf/local.m4 => main/lzo/autoconf/local.m4
rename : lzo/autoconf/ltmain.sh => main/lzo/autoconf/ltmain.sh
rename : lzo/autoconf/mdate-sh => main/lzo/autoconf/mdate-sh
rename : lzo/autoconf/missing => main/lzo/autoconf/missing
rename : lzo/autoconf/mkinstalldirs => main/lzo/autoconf/mkinstalldirs
rename : lzo/autoconf/py-compile => main/lzo/autoconf/py-compile
rename : lzo/autoconf/shtool => main/lzo/autoconf/shtool
rename : lzo/autoconf/ylwrap => main/lzo/autoconf/ylwrap
rename : lzo/config.h => main/lzo/config.h
rename : lzo/config.hin => main/lzo/config.hin
rename : lzo/config.log => main/lzo/config.log
rename : lzo/config.status => main/lzo/config.status
rename : lzo/configure => main/lzo/configure
rename : lzo/configure.ac => main/lzo/configure.ac
rename : lzo/doc/LZO.FAQ => main/lzo/doc/LZO.FAQ
rename : lzo/doc/LZO.TXT => main/lzo/doc/LZO.TXT
rename : lzo/doc/LZOAPI.TXT => main/lzo/doc/LZOAPI.TXT
rename : lzo/doc/LZOTEST.TXT => main/lzo/doc/LZOTEST.TXT
rename : lzo/examples/.deps/dict.Po => main/lzo/examples/.deps/dict.Po
rename : lzo/examples/.deps/lzopack.Po => main/lzo/examples/.deps/lzopack.Po
rename : lzo/examples/.deps/overlap.Po => main/lzo/examples/.deps/overlap.Po
rename : lzo/examples/.deps/precomp.Po => main/lzo/examples/.deps/precomp.Po
rename : lzo/examples/.deps/precomp2.Po => main/lzo/examples/.deps/precomp2.Po
rename : lzo/examples/.deps/simple.Po => main/lzo/examples/.deps/simple.Po
rename : lzo/examples/Makefile => main/lzo/examples/Makefile
rename : lzo/examples/Makefile.am => main/lzo/examples/Makefile.am
rename : lzo/examples/Makefile.in => main/lzo/examples/Makefile.in
rename : lzo/examples/dict.c => main/lzo/examples/dict.c
rename : lzo/examples/lzopack.c => main/lzo/examples/lzopack.c
rename : lzo/examples/overlap.c => main/lzo/examples/overlap.c
rename : lzo/examples/portab.h => main/lzo/examples/portab.h
rename : lzo/examples/portab_a.h => main/lzo/examples/portab_a.h
rename : lzo/examples/precomp.c => main/lzo/examples/precomp.c
rename : lzo/examples/precomp2.c => main/lzo/examples/precomp2.c
rename : lzo/examples/simple.c => main/lzo/examples/simple.c
rename : lzo/include/Makefile => main/lzo/include/Makefile
rename : lzo/include/Makefile.am => main/lzo/include/Makefile.am
rename : lzo/include/Makefile.in => main/lzo/include/Makefile.in
rename : lzo/include/lzo/Makefile => main/lzo/include/lzo/Makefile
rename : lzo/include/lzo/Makefile.am => main/lzo/include/lzo/Makefile.am
rename : lzo/include/lzo/Makefile.in => main/lzo/include/lzo/Makefile.in
rename : lzo/include/lzo/lzo1.h => main/lzo/include/lzo/lzo1.h
rename : lzo/include/lzo/lzo1a.h => main/lzo/include/lzo/lzo1a.h
rename : lzo/include/lzo/lzo1b.h => main/lzo/include/lzo/lzo1b.h
rename : lzo/include/lzo/lzo1c.h => main/lzo/include/lzo/lzo1c.h
rename : lzo/include/lzo/lzo1f.h => main/lzo/include/lzo/lzo1f.h
rename : lzo/include/lzo/lzo1x.h => main/lzo/include/lzo/lzo1x.h
rename : lzo/include/lzo/lzo1y.h => main/lzo/include/lzo/lzo1y.h
rename : lzo/include/lzo/lzo1z.h => main/lzo/include/lzo/lzo1z.h
rename : lzo/include/lzo/lzo2a.h => main/lzo/include/lzo/lzo2a.h
rename : lzo/include/lzo/lzo_asm.h => main/lzo/include/lzo/lzo_asm.h
rename : lzo/include/lzo/lzoconf.h => main/lzo/include/lzo/lzoconf.h
rename : lzo/include/lzo/lzodefs.h => main/lzo/include/lzo/lzodefs.h
rename : lzo/include/lzo/lzoutil.h => main/lzo/include/lzo/lzoutil.h
rename : lzo/libtool => main/lzo/libtool
rename : lzo/lzotest/.deps/lzotest.Po => main/lzo/lzotest/.deps/lzotest.Po
rename : lzo/lzotest/Makefile => main/lzo/lzotest/Makefile
rename : lzo/lzotest/Makefile.am => main/lzo/lzotest/Makefile.am
rename : lzo/lzotest/Makefile.in => main/lzo/lzotest/Makefile.in
rename : lzo/lzotest/asm.h => main/lzo/lzotest/asm.h
rename : lzo/lzotest/db.h => main/lzo/lzotest/db.h
rename : lzo/lzotest/lzotest.c => main/lzo/lzotest/lzotest.c
rename : lzo/lzotest/mygetopt.ch => main/lzo/lzotest/mygetopt.ch
rename : lzo/lzotest/mygetopt.h => main/lzo/lzotest/mygetopt.h
rename : lzo/lzotest/wrap.h => main/lzo/lzotest/wrap.h
rename : lzo/lzotest/wrapmisc.h => main/lzo/lzotest/wrapmisc.h
rename : lzo/minilzo/.deps/minilzo.Po => main/lzo/minilzo/.deps/minilzo.Po
rename : lzo/minilzo/.deps/testmini.Po => main/lzo/minilzo/.deps/testmini.Po
rename : lzo/minilzo/Makefile => main/lzo/minilzo/Makefile
rename : lzo/minilzo/Makefile.am => main/lzo/minilzo/Makefile.am
rename : lzo/minilzo/Makefile.in => main/lzo/minilzo/Makefile.in
rename : lzo/minilzo/Makefile.minilzo => main/lzo/minilzo/Makefile.minilzo
rename : lzo/minilzo/README.LZO => main/lzo/minilzo/README.LZO
rename : lzo/minilzo/minilzo.c => main/lzo/minilzo/minilzo.c
rename : lzo/minilzo/minilzo.h => main/lzo/minilzo/minilzo.h
rename : lzo/minilzo/testmini.c => main/lzo/minilzo/testmini.c
rename : lzo/src/.deps/lzo1.Plo => main/lzo/src/.deps/lzo1.Plo
rename : lzo/src/.deps/lzo1_99.Plo => main/lzo/src/.deps/lzo1_99.Plo
rename : lzo/src/.deps/lzo1a.Plo => main/lzo/src/.deps/lzo1a.Plo
rename : lzo/src/.deps/lzo1a_99.Plo => main/lzo/src/.deps/lzo1a_99.Plo
rename : lzo/src/.deps/lzo1b_1.Plo => main/lzo/src/.deps/lzo1b_1.Plo
rename : lzo/src/.deps/lzo1b_2.Plo => main/lzo/src/.deps/lzo1b_2.Plo
rename : lzo/src/.deps/lzo1b_3.Plo => main/lzo/src/.deps/lzo1b_3.Plo
rename : lzo/src/.deps/lzo1b_4.Plo => main/lzo/src/.deps/lzo1b_4.Plo
rename : lzo/src/.deps/lzo1b_5.Plo => main/lzo/src/.deps/lzo1b_5.Plo
rename : lzo/src/.deps/lzo1b_6.Plo => main/lzo/src/.deps/lzo1b_6.Plo
rename : lzo/src/.deps/lzo1b_7.Plo => main/lzo/src/.deps/lzo1b_7.Plo
rename : lzo/src/.deps/lzo1b_8.Plo => main/lzo/src/.deps/lzo1b_8.Plo
rename : lzo/src/.deps/lzo1b_9.Plo => main/lzo/src/.deps/lzo1b_9.Plo
rename : lzo/src/.deps/lzo1b_99.Plo => main/lzo/src/.deps/lzo1b_99.Plo
rename : lzo/src/.deps/lzo1b_9x.Plo => main/lzo/src/.deps/lzo1b_9x.Plo
rename : lzo/src/.deps/lzo1b_cc.Plo => main/lzo/src/.deps/lzo1b_cc.Plo
rename : lzo/src/.deps/lzo1b_d1.Plo => main/lzo/src/.deps/lzo1b_d1.Plo
rename : lzo/src/.deps/lzo1b_d2.Plo => main/lzo/src/.deps/lzo1b_d2.Plo
rename : lzo/src/.deps/lzo1b_rr.Plo => main/lzo/src/.deps/lzo1b_rr.Plo
rename : lzo/src/.deps/lzo1b_xx.Plo => main/lzo/src/.deps/lzo1b_xx.Plo
rename : lzo/src/.deps/lzo1c_1.Plo => main/lzo/src/.deps/lzo1c_1.Plo
rename : lzo/src/.deps/lzo1c_2.Plo => main/lzo/src/.deps/lzo1c_2.Plo
rename : lzo/src/.deps/lzo1c_3.Plo => main/lzo/src/.deps/lzo1c_3.Plo
rename : lzo/src/.deps/lzo1c_4.Plo => main/lzo/src/.deps/lzo1c_4.Plo
rename : lzo/src/.deps/lzo1c_5.Plo => main/lzo/src/.deps/lzo1c_5.Plo
rename : lzo/src/.deps/lzo1c_6.Plo => main/lzo/src/.deps/lzo1c_6.Plo
rename : lzo/src/.deps/lzo1c_7.Plo => main/lzo/src/.deps/lzo1c_7.Plo
rename : lzo/src/.deps/lzo1c_8.Plo => main/lzo/src/.deps/lzo1c_8.Plo
rename : lzo/src/.deps/lzo1c_9.Plo => main/lzo/src/.deps/lzo1c_9.Plo
rename : lzo/src/.deps/lzo1c_99.Plo => main/lzo/src/.deps/lzo1c_99.Plo
rename : lzo/src/.deps/lzo1c_9x.Plo => main/lzo/src/.deps/lzo1c_9x.Plo
rename : lzo/src/.deps/lzo1c_cc.Plo => main/lzo/src/.deps/lzo1c_cc.Plo
rename : lzo/src/.deps/lzo1c_d1.Plo => main/lzo/src/.deps/lzo1c_d1.Plo
rename : lzo/src/.deps/lzo1c_d2.Plo => main/lzo/src/.deps/lzo1c_d2.Plo
rename : lzo/src/.deps/lzo1c_rr.Plo => main/lzo/src/.deps/lzo1c_rr.Plo
rename : lzo/src/.deps/lzo1c_xx.Plo => main/lzo/src/.deps/lzo1c_xx.Plo
rename : lzo/src/.deps/lzo1f_1.Plo => main/lzo/src/.deps/lzo1f_1.Plo
rename : lzo/src/.deps/lzo1f_9x.Plo => main/lzo/src/.deps/lzo1f_9x.Plo
rename : lzo/src/.deps/lzo1f_d1.Plo => main/lzo/src/.deps/lzo1f_d1.Plo
rename : lzo/src/.deps/lzo1f_d2.Plo => main/lzo/src/.deps/lzo1f_d2.Plo
rename : lzo/src/.deps/lzo1x_1.Plo => main/lzo/src/.deps/lzo1x_1.Plo
rename : lzo/src/.deps/lzo1x_1k.Plo => main/lzo/src/.deps/lzo1x_1k.Plo
rename : lzo/src/.deps/lzo1x_1l.Plo => main/lzo/src/.deps/lzo1x_1l.Plo
rename : lzo/src/.deps/lzo1x_1o.Plo => main/lzo/src/.deps/lzo1x_1o.Plo
rename : lzo/src/.deps/lzo1x_9x.Plo => main/lzo/src/.deps/lzo1x_9x.Plo
rename : lzo/src/.deps/lzo1x_d1.Plo => main/lzo/src/.deps/lzo1x_d1.Plo
rename : lzo/src/.deps/lzo1x_d2.Plo => main/lzo/src/.deps/lzo1x_d2.Plo
rename : lzo/src/.deps/lzo1x_d3.Plo => main/lzo/src/.deps/lzo1x_d3.Plo
rename : lzo/src/.deps/lzo1x_o.Plo => main/lzo/src/.deps/lzo1x_o.Plo
rename : lzo/src/.deps/lzo1y_1.Plo => main/lzo/src/.deps/lzo1y_1.Plo
rename : lzo/src/.deps/lzo1y_9x.Plo => main/lzo/src/.deps/lzo1y_9x.Plo
rename : lzo/src/.deps/lzo1y_d1.Plo => main/lzo/src/.deps/lzo1y_d1.Plo
rename : lzo/src/.deps/lzo1y_d2.Plo => main/lzo/src/.deps/lzo1y_d2.Plo
rename : lzo/src/.deps/lzo1y_d3.Plo => main/lzo/src/.deps/lzo1y_d3.Plo
rename : lzo/src/.deps/lzo1y_o.Plo => main/lzo/src/.deps/lzo1y_o.Plo
rename : lzo/src/.deps/lzo1z_9x.Plo => main/lzo/src/.deps/lzo1z_9x.Plo
rename : lzo/src/.deps/lzo1z_d1.Plo => main/lzo/src/.deps/lzo1z_d1.Plo
rename : lzo/src/.deps/lzo1z_d2.Plo => main/lzo/src/.deps/lzo1z_d2.Plo
rename : lzo/src/.deps/lzo1z_d3.Plo => main/lzo/src/.deps/lzo1z_d3.Plo
rename : lzo/src/.deps/lzo2a_9x.Plo => main/lzo/src/.deps/lzo2a_9x.Plo
rename : lzo/src/.deps/lzo2a_d1.Plo => main/lzo/src/.deps/lzo2a_d1.Plo
rename : lzo/src/.deps/lzo2a_d2.Plo => main/lzo/src/.deps/lzo2a_d2.Plo
rename : lzo/src/.deps/lzo_crc.Plo => main/lzo/src/.deps/lzo_crc.Plo
rename : lzo/src/.deps/lzo_init.Plo => main/lzo/src/.deps/lzo_init.Plo
rename : lzo/src/.deps/lzo_ptr.Plo => main/lzo/src/.deps/lzo_ptr.Plo
rename : lzo/src/.deps/lzo_str.Plo => main/lzo/src/.deps/lzo_str.Plo
rename : lzo/src/.deps/lzo_util.Plo => main/lzo/src/.deps/lzo_util.Plo
rename : lzo/src/Makefile => main/lzo/src/Makefile
rename : lzo/src/Makefile.am => main/lzo/src/Makefile.am
rename : lzo/src/Makefile.in => main/lzo/src/Makefile.in
rename : lzo/src/compr1b.h => main/lzo/src/compr1b.h
rename : lzo/src/compr1c.h => main/lzo/src/compr1c.h
rename : lzo/src/config1.h => main/lzo/src/config1.h
rename : lzo/src/config1a.h => main/lzo/src/config1a.h
rename : lzo/src/config1b.h => main/lzo/src/config1b.h
rename : lzo/src/config1c.h => main/lzo/src/config1c.h
rename : lzo/src/config1f.h => main/lzo/src/config1f.h
rename : lzo/src/config1x.h => main/lzo/src/config1x.h
rename : lzo/src/config1y.h => main/lzo/src/config1y.h
rename : lzo/src/config1z.h => main/lzo/src/config1z.h
rename : lzo/src/config2a.h => main/lzo/src/config2a.h
rename : lzo/src/lzo1.c => main/lzo/src/lzo1.c
rename : lzo/src/lzo1_99.c => main/lzo/src/lzo1_99.c
rename : lzo/src/lzo1_cm.ch => main/lzo/src/lzo1_cm.ch
rename : lzo/src/lzo1_d.ch => main/lzo/src/lzo1_d.ch
rename : lzo/src/lzo1a.c => main/lzo/src/lzo1a.c
rename : lzo/src/lzo1a_99.c => main/lzo/src/lzo1a_99.c
rename : lzo/src/lzo1a_cm.ch => main/lzo/src/lzo1a_cm.ch
rename : lzo/src/lzo1a_cr.ch => main/lzo/src/lzo1a_cr.ch
rename : lzo/src/lzo1a_de.h => main/lzo/src/lzo1a_de.h
rename : lzo/src/lzo1b_1.c => main/lzo/src/lzo1b_1.c
rename : lzo/src/lzo1b_2.c => main/lzo/src/lzo1b_2.c
rename : lzo/src/lzo1b_3.c => main/lzo/src/lzo1b_3.c
rename : lzo/src/lzo1b_4.c => main/lzo/src/lzo1b_4.c
rename : lzo/src/lzo1b_5.c => main/lzo/src/lzo1b_5.c
rename : lzo/src/lzo1b_6.c => main/lzo/src/lzo1b_6.c
rename : lzo/src/lzo1b_7.c => main/lzo/src/lzo1b_7.c
rename : lzo/src/lzo1b_8.c => main/lzo/src/lzo1b_8.c
rename : lzo/src/lzo1b_9.c => main/lzo/src/lzo1b_9.c
rename : lzo/src/lzo1b_99.c => main/lzo/src/lzo1b_99.c
rename : lzo/src/lzo1b_9x.c => main/lzo/src/lzo1b_9x.c
rename : lzo/src/lzo1b_c.ch => main/lzo/src/lzo1b_c.ch
rename : lzo/src/lzo1b_cc.c => main/lzo/src/lzo1b_cc.c
rename : lzo/src/lzo1b_cc.h => main/lzo/src/lzo1b_cc.h
rename : lzo/src/lzo1b_cm.ch => main/lzo/src/lzo1b_cm.ch
rename : lzo/src/lzo1b_cr.ch => main/lzo/src/lzo1b_cr.ch
rename : lzo/src/lzo1b_d.ch => main/lzo/src/lzo1b_d.ch
rename : lzo/src/lzo1b_d1.c => main/lzo/src/lzo1b_d1.c
rename : lzo/src/lzo1b_d2.c => main/lzo/src/lzo1b_d2.c
rename : lzo/src/lzo1b_de.h => main/lzo/src/lzo1b_de.h
rename : lzo/src/lzo1b_r.ch => main/lzo/src/lzo1b_r.ch
rename : lzo/src/lzo1b_rr.c => main/lzo/src/lzo1b_rr.c
rename : lzo/src/lzo1b_sm.ch => main/lzo/src/lzo1b_sm.ch
rename : lzo/src/lzo1b_tm.ch => main/lzo/src/lzo1b_tm.ch
rename : lzo/src/lzo1b_xx.c => main/lzo/src/lzo1b_xx.c
rename : lzo/src/lzo1c_1.c => main/lzo/src/lzo1c_1.c
rename : lzo/src/lzo1c_2.c => main/lzo/src/lzo1c_2.c
rename : lzo/src/lzo1c_3.c => main/lzo/src/lzo1c_3.c
rename : lzo/src/lzo1c_4.c => main/lzo/src/lzo1c_4.c
rename : lzo/src/lzo1c_5.c => main/lzo/src/lzo1c_5.c
rename : lzo/src/lzo1c_6.c => main/lzo/src/lzo1c_6.c
rename : lzo/src/lzo1c_7.c => main/lzo/src/lzo1c_7.c
rename : lzo/src/lzo1c_8.c => main/lzo/src/lzo1c_8.c
rename : lzo/src/lzo1c_9.c => main/lzo/src/lzo1c_9.c
rename : lzo/src/lzo1c_99.c => main/lzo/src/lzo1c_99.c
rename : lzo/src/lzo1c_9x.c => main/lzo/src/lzo1c_9x.c
rename : lzo/src/lzo1c_cc.c => main/lzo/src/lzo1c_cc.c
rename : lzo/src/lzo1c_cc.h => main/lzo/src/lzo1c_cc.h
rename : lzo/src/lzo1c_d1.c => main/lzo/src/lzo1c_d1.c
rename : lzo/src/lzo1c_d2.c => main/lzo/src/lzo1c_d2.c
rename : lzo/src/lzo1c_rr.c => main/lzo/src/lzo1c_rr.c
rename : lzo/src/lzo1c_xx.c => main/lzo/src/lzo1c_xx.c
rename : lzo/src/lzo1f_1.c => main/lzo/src/lzo1f_1.c
rename : lzo/src/lzo1f_9x.c => main/lzo/src/lzo1f_9x.c
rename : lzo/src/lzo1f_d.ch => main/lzo/src/lzo1f_d.ch
rename : lzo/src/lzo1f_d1.c => main/lzo/src/lzo1f_d1.c
rename : lzo/src/lzo1f_d2.c => main/lzo/src/lzo1f_d2.c
rename : lzo/src/lzo1x_1.c => main/lzo/src/lzo1x_1.c
rename : lzo/src/lzo1x_1k.c => main/lzo/src/lzo1x_1k.c
rename : lzo/src/lzo1x_1l.c => main/lzo/src/lzo1x_1l.c
rename : lzo/src/lzo1x_1o.c => main/lzo/src/lzo1x_1o.c
rename : lzo/src/lzo1x_9x.c => main/lzo/src/lzo1x_9x.c
rename : lzo/src/lzo1x_c.ch => main/lzo/src/lzo1x_c.ch
rename : lzo/src/lzo1x_d.ch => main/lzo/src/lzo1x_d.ch
rename : lzo/src/lzo1x_d1.c => main/lzo/src/lzo1x_d1.c
rename : lzo/src/lzo1x_d2.c => main/lzo/src/lzo1x_d2.c
rename : lzo/src/lzo1x_d3.c => main/lzo/src/lzo1x_d3.c
rename : lzo/src/lzo1x_o.c => main/lzo/src/lzo1x_o.c
rename : lzo/src/lzo1x_oo.ch => main/lzo/src/lzo1x_oo.ch
rename : lzo/src/lzo1y_1.c => main/lzo/src/lzo1y_1.c
rename : lzo/src/lzo1y_9x.c => main/lzo/src/lzo1y_9x.c
rename : lzo/src/lzo1y_d1.c => main/lzo/src/lzo1y_d1.c
rename : lzo/src/lzo1y_d2.c => main/lzo/src/lzo1y_d2.c
rename : lzo/src/lzo1y_d3.c => main/lzo/src/lzo1y_d3.c
rename : lzo/src/lzo1y_o.c => main/lzo/src/lzo1y_o.c
rename : lzo/src/lzo1z_9x.c => main/lzo/src/lzo1z_9x.c
rename : lzo/src/lzo1z_d1.c => main/lzo/src/lzo1z_d1.c
rename : lzo/src/lzo1z_d2.c => main/lzo/src/lzo1z_d2.c
rename : lzo/src/lzo1z_d3.c => main/lzo/src/lzo1z_d3.c
rename : lzo/src/lzo2a_9x.c => main/lzo/src/lzo2a_9x.c
rename : lzo/src/lzo2a_d.ch => main/lzo/src/lzo2a_d.ch
rename : lzo/src/lzo2a_d1.c => main/lzo/src/lzo2a_d1.c
rename : lzo/src/lzo2a_d2.c => main/lzo/src/lzo2a_d2.c
rename : lzo/src/lzo_conf.h => main/lzo/src/lzo_conf.h
rename : lzo/src/lzo_crc.c => main/lzo/src/lzo_crc.c
rename : lzo/src/lzo_dict.h => main/lzo/src/lzo_dict.h
rename : lzo/src/lzo_dll.ch => main/lzo/src/lzo_dll.ch
rename : lzo/src/lzo_func.ch => main/lzo/src/lzo_func.ch
rename : lzo/src/lzo_init.c => main/lzo/src/lzo_init.c
rename : lzo/src/lzo_mchw.ch => main/lzo/src/lzo_mchw.ch
rename : lzo/src/lzo_ptr.c => main/lzo/src/lzo_ptr.c
rename : lzo/src/lzo_ptr.h => main/lzo/src/lzo_ptr.h
rename : lzo/src/lzo_str.c => main/lzo/src/lzo_str.c
rename : lzo/src/lzo_swd.ch => main/lzo/src/lzo_swd.ch
rename : lzo/src/lzo_util.c => main/lzo/src/lzo_util.c
rename : lzo/src/miniacc.h => main/lzo/src/miniacc.h
rename : lzo/src/stats1a.h => main/lzo/src/stats1a.h
rename : lzo/src/stats1b.h => main/lzo/src/stats1b.h
rename : lzo/src/stats1c.h => main/lzo/src/stats1c.h
rename : lzo/stamp-h1 => main/lzo/stamp-h1
rename : lzo/tests/.deps/align.Po => main/lzo/tests/.deps/align.Po
rename : lzo/tests/.deps/chksum.Po => main/lzo/tests/.deps/chksum.Po
rename : lzo/tests/.deps/promote.Po => main/lzo/tests/.deps/promote.Po
rename : lzo/tests/.deps/sizes.Po => main/lzo/tests/.deps/sizes.Po
rename : lzo/tests/Makefile => main/lzo/tests/Makefile
rename : lzo/tests/Makefile.am => main/lzo/tests/Makefile.am
rename : lzo/tests/Makefile.in => main/lzo/tests/Makefile.in
rename : lzo/tests/align.c => main/lzo/tests/align.c
rename : lzo/tests/chksum.c => main/lzo/tests/chksum.c
rename : lzo/tests/promote.c => main/lzo/tests/promote.c
rename : lzo/tests/sizes.c => main/lzo/tests/sizes.c
rename : lzo/util/check.sh => main/lzo/util/check.sh
rename : lzo/util/checkasm.sh => main/lzo/util/checkasm.sh
rename : lzo/util/notime.pl => main/lzo/util/notime.pl
rename : lzo/util/overlap.sh => main/lzo/util/overlap.sh
rename : lzo/util/shortf.pl => main/lzo/util/shortf.pl
rename : lzo/util/table.pl => main/lzo/util/table.pl
rename : lzo/util/uncompr.pl => main/lzo/util/uncompr.pl
rename : openssl/Android.mk => main/openssl/Android.mk
rename : openssl/CleanSpec.mk => main/openssl/CleanSpec.mk
rename : openssl/MODULE_LICENSE_BSD_LIKE => main/openssl/MODULE_LICENSE_BSD_LIKE
rename : openssl/NOTICE => main/openssl/NOTICE
rename : openssl/README.android => main/openssl/README.android
rename : openssl/ThirdPartyProject.prop => main/openssl/ThirdPartyProject.prop
rename : openssl/android-config.mk => main/openssl/android-config.mk
rename : openssl/android.testssl/CAss.cnf => main/openssl/android.testssl/CAss.cnf
rename : openssl/android.testssl/Uss.cnf => main/openssl/android.testssl/Uss.cnf
rename : openssl/android.testssl/server2.pem => main/openssl/android.testssl/server2.pem
rename : openssl/android.testssl/testssl => main/openssl/android.testssl/testssl
rename : openssl/android.testssl/testssl.sh => main/openssl/android.testssl/testssl.sh
rename : openssl/apps/Android.mk => main/openssl/apps/Android.mk
rename : openssl/apps/CA.pl => main/openssl/apps/CA.pl
rename : openssl/apps/CA.pl.in => main/openssl/apps/CA.pl.in
rename : openssl/apps/CA.sh => main/openssl/apps/CA.sh
rename : openssl/apps/app_rand.c => main/openssl/apps/app_rand.c
rename : openssl/apps/apps.c => main/openssl/apps/apps.c
rename : openssl/apps/apps.h => main/openssl/apps/apps.h
rename : openssl/apps/asn1pars.c => main/openssl/apps/asn1pars.c
rename : openssl/apps/ca-cert.srl => main/openssl/apps/ca-cert.srl
rename : openssl/apps/ca-key.pem => main/openssl/apps/ca-key.pem
rename : openssl/apps/ca-req.pem => main/openssl/apps/ca-req.pem
rename : openssl/apps/ca.c => main/openssl/apps/ca.c
rename : openssl/apps/cert.pem => main/openssl/apps/cert.pem
rename : openssl/apps/ciphers.c => main/openssl/apps/ciphers.c
rename : openssl/apps/client.pem => main/openssl/apps/client.pem
rename : openssl/apps/cms.c => main/openssl/apps/cms.c
rename : openssl/apps/crl.c => main/openssl/apps/crl.c
rename : openssl/apps/crl2p7.c => main/openssl/apps/crl2p7.c
rename : openssl/apps/dgst.c => main/openssl/apps/dgst.c
rename : openssl/apps/dh.c => main/openssl/apps/dh.c
rename : openssl/apps/dh1024.pem => main/openssl/apps/dh1024.pem
rename : openssl/apps/dh2048.pem => main/openssl/apps/dh2048.pem
rename : openssl/apps/dh4096.pem => main/openssl/apps/dh4096.pem
rename : openssl/apps/dh512.pem => main/openssl/apps/dh512.pem
rename : openssl/apps/dhparam.c => main/openssl/apps/dhparam.c
rename : openssl/apps/dsa-ca.pem => main/openssl/apps/dsa-ca.pem
rename : openssl/apps/dsa-pca.pem => main/openssl/apps/dsa-pca.pem
rename : openssl/apps/dsa.c => main/openssl/apps/dsa.c
rename : openssl/apps/dsa1024.pem => main/openssl/apps/dsa1024.pem
rename : openssl/apps/dsa512.pem => main/openssl/apps/dsa512.pem
rename : openssl/apps/dsap.pem => main/openssl/apps/dsap.pem
rename : openssl/apps/dsaparam.c => main/openssl/apps/dsaparam.c
rename : openssl/apps/ec.c => main/openssl/apps/ec.c
rename : openssl/apps/ecparam.c => main/openssl/apps/ecparam.c
rename : openssl/apps/enc.c => main/openssl/apps/enc.c
rename : openssl/apps/engine.c => main/openssl/apps/engine.c
rename : openssl/apps/errstr.c => main/openssl/apps/errstr.c
rename : openssl/apps/gendh.c => main/openssl/apps/gendh.c
rename : openssl/apps/gendsa.c => main/openssl/apps/gendsa.c
rename : openssl/apps/genpkey.c => main/openssl/apps/genpkey.c
rename : openssl/apps/genrsa.c => main/openssl/apps/genrsa.c
rename : openssl/apps/md4.c => main/openssl/apps/md4.c
rename : openssl/apps/nseq.c => main/openssl/apps/nseq.c
rename : openssl/apps/ocsp.c => main/openssl/apps/ocsp.c
rename : openssl/apps/oid.cnf => main/openssl/apps/oid.cnf
rename : openssl/apps/openssl.c => main/openssl/apps/openssl.c
rename : openssl/apps/openssl.cnf => main/openssl/apps/openssl.cnf
rename : openssl/apps/passwd.c => main/openssl/apps/passwd.c
rename : openssl/apps/pca-cert.srl => main/openssl/apps/pca-cert.srl
rename : openssl/apps/pca-key.pem => main/openssl/apps/pca-key.pem
rename : openssl/apps/pca-req.pem => main/openssl/apps/pca-req.pem
rename : openssl/apps/pkcs12.c => main/openssl/apps/pkcs12.c
rename : openssl/apps/pkcs7.c => main/openssl/apps/pkcs7.c
rename : openssl/apps/pkcs8.c => main/openssl/apps/pkcs8.c
rename : openssl/apps/pkey.c => main/openssl/apps/pkey.c
rename : openssl/apps/pkeyparam.c => main/openssl/apps/pkeyparam.c
rename : openssl/apps/pkeyutl.c => main/openssl/apps/pkeyutl.c
rename : openssl/apps/prime.c => main/openssl/apps/prime.c
rename : openssl/apps/privkey.pem => main/openssl/apps/privkey.pem
rename : openssl/apps/progs.h => main/openssl/apps/progs.h
rename : openssl/apps/progs.pl => main/openssl/apps/progs.pl
rename : openssl/apps/rand.c => main/openssl/apps/rand.c
rename : openssl/apps/req.c => main/openssl/apps/req.c
rename : openssl/apps/req.pem => main/openssl/apps/req.pem
rename : openssl/apps/rsa.c => main/openssl/apps/rsa.c
rename : openssl/apps/rsa8192.pem => main/openssl/apps/rsa8192.pem
rename : openssl/apps/rsautl.c => main/openssl/apps/rsautl.c
rename : openssl/apps/s1024key.pem => main/openssl/apps/s1024key.pem
rename : openssl/apps/s1024req.pem => main/openssl/apps/s1024req.pem
rename : openssl/apps/s512-key.pem => main/openssl/apps/s512-key.pem
rename : openssl/apps/s512-req.pem => main/openssl/apps/s512-req.pem
rename : openssl/apps/s_apps.h => main/openssl/apps/s_apps.h
rename : openssl/apps/s_cb.c => main/openssl/apps/s_cb.c
rename : openssl/apps/s_client.c => main/openssl/apps/s_client.c
rename : openssl/apps/s_server.c => main/openssl/apps/s_server.c
rename : openssl/apps/s_socket.c => main/openssl/apps/s_socket.c
rename : openssl/apps/s_time.c => main/openssl/apps/s_time.c
rename : openssl/apps/server.pem => main/openssl/apps/server.pem
rename : openssl/apps/server.srl => main/openssl/apps/server.srl
rename : openssl/apps/server2.pem => main/openssl/apps/server2.pem
rename : openssl/apps/sess_id.c => main/openssl/apps/sess_id.c
rename : openssl/apps/smime.c => main/openssl/apps/smime.c
rename : openssl/apps/speed.c => main/openssl/apps/speed.c
rename : openssl/apps/spkac.c => main/openssl/apps/spkac.c
rename : openssl/apps/testCA.pem => main/openssl/apps/testCA.pem
rename : openssl/apps/testdsa.h => main/openssl/apps/testdsa.h
rename : openssl/apps/testrsa.h => main/openssl/apps/testrsa.h
rename : openssl/apps/timeouts.h => main/openssl/apps/timeouts.h
rename : openssl/apps/verify.c => main/openssl/apps/verify.c
rename : openssl/apps/version.c => main/openssl/apps/version.c
rename : openssl/apps/winrand.c => main/openssl/apps/winrand.c
rename : openssl/apps/x509.c => main/openssl/apps/x509.c
rename : openssl/crypto/Android.mk => main/openssl/crypto/Android.mk
rename : openssl/crypto/LPdir_nyi.c => main/openssl/crypto/LPdir_nyi.c
rename : openssl/crypto/LPdir_unix.c => main/openssl/crypto/LPdir_unix.c
rename : openssl/crypto/LPdir_win.c => main/openssl/crypto/LPdir_win.c
rename : openssl/crypto/LPdir_wince.c => main/openssl/crypto/LPdir_wince.c
rename : openssl/crypto/aes/README => main/openssl/crypto/aes/README
rename : openssl/crypto/aes/aes.h => main/openssl/crypto/aes/aes.h
rename : openssl/crypto/aes/aes_cbc.c => main/openssl/crypto/aes/aes_cbc.c
rename : openssl/crypto/aes/aes_cfb.c => main/openssl/crypto/aes/aes_cfb.c
rename : openssl/crypto/aes/aes_core.c => main/openssl/crypto/aes/aes_core.c
rename : openssl/crypto/aes/aes_ctr.c => main/openssl/crypto/aes/aes_ctr.c
rename : openssl/crypto/aes/aes_ecb.c => main/openssl/crypto/aes/aes_ecb.c
rename : openssl/crypto/aes/aes_ige.c => main/openssl/crypto/aes/aes_ige.c
rename : openssl/crypto/aes/aes_locl.h => main/openssl/crypto/aes/aes_locl.h
rename : openssl/crypto/aes/aes_misc.c => main/openssl/crypto/aes/aes_misc.c
rename : openssl/crypto/aes/aes_ofb.c => main/openssl/crypto/aes/aes_ofb.c
rename : openssl/crypto/aes/aes_wrap.c => main/openssl/crypto/aes/aes_wrap.c
rename : openssl/crypto/aes/aes_x86core.c => main/openssl/crypto/aes/aes_x86core.c
rename : openssl/crypto/aes/asm/aes-586.pl => main/openssl/crypto/aes/asm/aes-586.pl
rename : openssl/crypto/aes/asm/aes-armv4.pl => main/openssl/crypto/aes/asm/aes-armv4.pl
rename : openssl/crypto/aes/asm/aes-armv4.s => main/openssl/crypto/aes/asm/aes-armv4.s
rename : openssl/crypto/aes/asm/aes-ia64.S => main/openssl/crypto/aes/asm/aes-ia64.S
rename : openssl/crypto/aes/asm/aes-ppc.pl => main/openssl/crypto/aes/asm/aes-ppc.pl
rename : openssl/crypto/aes/asm/aes-s390x.pl => main/openssl/crypto/aes/asm/aes-s390x.pl
rename : openssl/crypto/aes/asm/aes-sparcv9.pl => main/openssl/crypto/aes/asm/aes-sparcv9.pl
rename : openssl/crypto/aes/asm/aes-x86_64.pl => main/openssl/crypto/aes/asm/aes-x86_64.pl
rename : openssl/crypto/alphacpuid.pl => main/openssl/crypto/alphacpuid.pl
rename : openssl/crypto/asn1/a_bitstr.c => main/openssl/crypto/asn1/a_bitstr.c
rename : openssl/crypto/asn1/a_bool.c => main/openssl/crypto/asn1/a_bool.c
rename : openssl/crypto/asn1/a_bytes.c => main/openssl/crypto/asn1/a_bytes.c
rename : openssl/crypto/asn1/a_d2i_fp.c => main/openssl/crypto/asn1/a_d2i_fp.c
rename : openssl/crypto/asn1/a_digest.c => main/openssl/crypto/asn1/a_digest.c
rename : openssl/crypto/asn1/a_dup.c => main/openssl/crypto/asn1/a_dup.c
rename : openssl/crypto/asn1/a_enum.c => main/openssl/crypto/asn1/a_enum.c
rename : openssl/crypto/asn1/a_gentm.c => main/openssl/crypto/asn1/a_gentm.c
rename : openssl/crypto/asn1/a_i2d_fp.c => main/openssl/crypto/asn1/a_i2d_fp.c
rename : openssl/crypto/asn1/a_int.c => main/openssl/crypto/asn1/a_int.c
rename : openssl/crypto/asn1/a_mbstr.c => main/openssl/crypto/asn1/a_mbstr.c
rename : openssl/crypto/asn1/a_object.c => main/openssl/crypto/asn1/a_object.c
rename : openssl/crypto/asn1/a_octet.c => main/openssl/crypto/asn1/a_octet.c
rename : openssl/crypto/asn1/a_print.c => main/openssl/crypto/asn1/a_print.c
rename : openssl/crypto/asn1/a_set.c => main/openssl/crypto/asn1/a_set.c
rename : openssl/crypto/asn1/a_sign.c => main/openssl/crypto/asn1/a_sign.c
rename : openssl/crypto/asn1/a_strex.c => main/openssl/crypto/asn1/a_strex.c
rename : openssl/crypto/asn1/a_strnid.c => main/openssl/crypto/asn1/a_strnid.c
rename : openssl/crypto/asn1/a_time.c => main/openssl/crypto/asn1/a_time.c
rename : openssl/crypto/asn1/a_type.c => main/openssl/crypto/asn1/a_type.c
rename : openssl/crypto/asn1/a_utctm.c => main/openssl/crypto/asn1/a_utctm.c
rename : openssl/crypto/asn1/a_utf8.c => main/openssl/crypto/asn1/a_utf8.c
rename : openssl/crypto/asn1/a_verify.c => main/openssl/crypto/asn1/a_verify.c
rename : openssl/crypto/asn1/ameth_lib.c => main/openssl/crypto/asn1/ameth_lib.c
rename : openssl/crypto/asn1/asn1.h => main/openssl/crypto/asn1/asn1.h
rename : openssl/crypto/asn1/asn1_err.c => main/openssl/crypto/asn1/asn1_err.c
rename : openssl/crypto/asn1/asn1_gen.c => main/openssl/crypto/asn1/asn1_gen.c
rename : openssl/crypto/asn1/asn1_lib.c => main/openssl/crypto/asn1/asn1_lib.c
rename : openssl/crypto/asn1/asn1_locl.h => main/openssl/crypto/asn1/asn1_locl.h
rename : openssl/crypto/asn1/asn1_mac.h => main/openssl/crypto/asn1/asn1_mac.h
rename : openssl/crypto/asn1/asn1_par.c => main/openssl/crypto/asn1/asn1_par.c
rename : openssl/crypto/asn1/asn1t.h => main/openssl/crypto/asn1/asn1t.h
rename : openssl/crypto/asn1/asn_mime.c => main/openssl/crypto/asn1/asn_mime.c
rename : openssl/crypto/asn1/asn_moid.c => main/openssl/crypto/asn1/asn_moid.c
rename : openssl/crypto/asn1/asn_pack.c => main/openssl/crypto/asn1/asn_pack.c
rename : openssl/crypto/asn1/bio_asn1.c => main/openssl/crypto/asn1/bio_asn1.c
rename : openssl/crypto/asn1/bio_ndef.c => main/openssl/crypto/asn1/bio_ndef.c
rename : openssl/crypto/asn1/charmap.h => main/openssl/crypto/asn1/charmap.h
rename : openssl/crypto/asn1/charmap.pl => main/openssl/crypto/asn1/charmap.pl
rename : openssl/crypto/asn1/d2i_pr.c => main/openssl/crypto/asn1/d2i_pr.c
rename : openssl/crypto/asn1/d2i_pu.c => main/openssl/crypto/asn1/d2i_pu.c
rename : openssl/crypto/asn1/evp_asn1.c => main/openssl/crypto/asn1/evp_asn1.c
rename : openssl/crypto/asn1/f_enum.c => main/openssl/crypto/asn1/f_enum.c
rename : openssl/crypto/asn1/f_int.c => main/openssl/crypto/asn1/f_int.c
rename : openssl/crypto/asn1/f_string.c => main/openssl/crypto/asn1/f_string.c
rename : openssl/crypto/asn1/i2d_pr.c => main/openssl/crypto/asn1/i2d_pr.c
rename : openssl/crypto/asn1/i2d_pu.c => main/openssl/crypto/asn1/i2d_pu.c
rename : openssl/crypto/asn1/n_pkey.c => main/openssl/crypto/asn1/n_pkey.c
rename : openssl/crypto/asn1/nsseq.c => main/openssl/crypto/asn1/nsseq.c
rename : openssl/crypto/asn1/p5_pbe.c => main/openssl/crypto/asn1/p5_pbe.c
rename : openssl/crypto/asn1/p5_pbev2.c => main/openssl/crypto/asn1/p5_pbev2.c
rename : openssl/crypto/asn1/p8_pkey.c => main/openssl/crypto/asn1/p8_pkey.c
rename : openssl/crypto/asn1/t_bitst.c => main/openssl/crypto/asn1/t_bitst.c
rename : openssl/crypto/asn1/t_crl.c => main/openssl/crypto/asn1/t_crl.c
rename : openssl/crypto/asn1/t_pkey.c => main/openssl/crypto/asn1/t_pkey.c
rename : openssl/crypto/asn1/t_req.c => main/openssl/crypto/asn1/t_req.c
rename : openssl/crypto/asn1/t_spki.c => main/openssl/crypto/asn1/t_spki.c
rename : openssl/crypto/asn1/t_x509.c => main/openssl/crypto/asn1/t_x509.c
rename : openssl/crypto/asn1/t_x509a.c => main/openssl/crypto/asn1/t_x509a.c
rename : openssl/crypto/asn1/tasn_dec.c => main/openssl/crypto/asn1/tasn_dec.c
rename : openssl/crypto/asn1/tasn_enc.c => main/openssl/crypto/asn1/tasn_enc.c
rename : openssl/crypto/asn1/tasn_fre.c => main/openssl/crypto/asn1/tasn_fre.c
rename : openssl/crypto/asn1/tasn_new.c => main/openssl/crypto/asn1/tasn_new.c
rename : openssl/crypto/asn1/tasn_prn.c => main/openssl/crypto/asn1/tasn_prn.c
rename : openssl/crypto/asn1/tasn_typ.c => main/openssl/crypto/asn1/tasn_typ.c
rename : openssl/crypto/asn1/tasn_utl.c => main/openssl/crypto/asn1/tasn_utl.c
rename : openssl/crypto/asn1/x_algor.c => main/openssl/crypto/asn1/x_algor.c
rename : openssl/crypto/asn1/x_attrib.c => main/openssl/crypto/asn1/x_attrib.c
rename : openssl/crypto/asn1/x_bignum.c => main/openssl/crypto/asn1/x_bignum.c
rename : openssl/crypto/asn1/x_crl.c => main/openssl/crypto/asn1/x_crl.c
rename : openssl/crypto/asn1/x_exten.c => main/openssl/crypto/asn1/x_exten.c
rename : openssl/crypto/asn1/x_info.c => main/openssl/crypto/asn1/x_info.c
rename : openssl/crypto/asn1/x_long.c => main/openssl/crypto/asn1/x_long.c
rename : openssl/crypto/asn1/x_name.c => main/openssl/crypto/asn1/x_name.c
rename : openssl/crypto/asn1/x_nx509.c => main/openssl/crypto/asn1/x_nx509.c
rename : openssl/crypto/asn1/x_pkey.c => main/openssl/crypto/asn1/x_pkey.c
rename : openssl/crypto/asn1/x_pubkey.c => main/openssl/crypto/asn1/x_pubkey.c
rename : openssl/crypto/asn1/x_req.c => main/openssl/crypto/asn1/x_req.c
rename : openssl/crypto/asn1/x_sig.c => main/openssl/crypto/asn1/x_sig.c
rename : openssl/crypto/asn1/x_spki.c => main/openssl/crypto/asn1/x_spki.c
rename : openssl/crypto/asn1/x_val.c => main/openssl/crypto/asn1/x_val.c
rename : openssl/crypto/asn1/x_x509.c => main/openssl/crypto/asn1/x_x509.c
rename : openssl/crypto/asn1/x_x509a.c => main/openssl/crypto/asn1/x_x509a.c
rename : openssl/crypto/bf/COPYRIGHT => main/openssl/crypto/bf/COPYRIGHT
rename : openssl/crypto/bf/asm/bf-586.pl => main/openssl/crypto/bf/asm/bf-586.pl
rename : openssl/crypto/bf/asm/bf-686.pl => main/openssl/crypto/bf/asm/bf-686.pl
rename : openssl/crypto/bf/bf_cfb64.c => main/openssl/crypto/bf/bf_cfb64.c
rename : openssl/crypto/bf/bf_ecb.c => main/openssl/crypto/bf/bf_ecb.c
rename : openssl/crypto/bf/bf_enc.c => main/openssl/crypto/bf/bf_enc.c
rename : openssl/crypto/bf/bf_locl.h => main/openssl/crypto/bf/bf_locl.h
rename : openssl/crypto/bf/bf_ofb64.c => main/openssl/crypto/bf/bf_ofb64.c
rename : openssl/crypto/bf/bf_pi.h => main/openssl/crypto/bf/bf_pi.h
rename : openssl/crypto/bf/bf_skey.c => main/openssl/crypto/bf/bf_skey.c
rename : openssl/crypto/bf/blowfish.h => main/openssl/crypto/bf/blowfish.h
rename : openssl/crypto/bio/b_dump.c => main/openssl/crypto/bio/b_dump.c
rename : openssl/crypto/bio/b_print.c => main/openssl/crypto/bio/b_print.c
rename : openssl/crypto/bio/b_sock.c => main/openssl/crypto/bio/b_sock.c
rename : openssl/crypto/bio/bf_buff.c => main/openssl/crypto/bio/bf_buff.c
rename : openssl/crypto/bio/bf_lbuf.c => main/openssl/crypto/bio/bf_lbuf.c
rename : openssl/crypto/bio/bf_nbio.c => main/openssl/crypto/bio/bf_nbio.c
rename : openssl/crypto/bio/bf_null.c => main/openssl/crypto/bio/bf_null.c
rename : openssl/crypto/bio/bio.h => main/openssl/crypto/bio/bio.h
rename : openssl/crypto/bio/bio_cb.c => main/openssl/crypto/bio/bio_cb.c
rename : openssl/crypto/bio/bio_err.c => main/openssl/crypto/bio/bio_err.c
rename : openssl/crypto/bio/bio_lcl.h => main/openssl/crypto/bio/bio_lcl.h
rename : openssl/crypto/bio/bio_lib.c => main/openssl/crypto/bio/bio_lib.c
rename : openssl/crypto/bio/bss_acpt.c => main/openssl/crypto/bio/bss_acpt.c
rename : openssl/crypto/bio/bss_bio.c => main/openssl/crypto/bio/bss_bio.c
rename : openssl/crypto/bio/bss_conn.c => main/openssl/crypto/bio/bss_conn.c
rename : openssl/crypto/bio/bss_dgram.c => main/openssl/crypto/bio/bss_dgram.c
rename : openssl/crypto/bio/bss_fd.c => main/openssl/crypto/bio/bss_fd.c
rename : openssl/crypto/bio/bss_file.c => main/openssl/crypto/bio/bss_file.c
rename : openssl/crypto/bio/bss_log.c => main/openssl/crypto/bio/bss_log.c
rename : openssl/crypto/bio/bss_mem.c => main/openssl/crypto/bio/bss_mem.c
rename : openssl/crypto/bio/bss_null.c => main/openssl/crypto/bio/bss_null.c
rename : openssl/crypto/bio/bss_sock.c => main/openssl/crypto/bio/bss_sock.c
rename : openssl/crypto/bn/asm/README => main/openssl/crypto/bn/asm/README
rename : openssl/crypto/bn/asm/alpha-mont.pl => main/openssl/crypto/bn/asm/alpha-mont.pl
rename : openssl/crypto/bn/asm/armv4-mont.pl => main/openssl/crypto/bn/asm/armv4-mont.pl
rename : openssl/crypto/bn/asm/armv4-mont.s => main/openssl/crypto/bn/asm/armv4-mont.s
rename : openssl/crypto/bn/asm/bn-586.pl => main/openssl/crypto/bn/asm/bn-586.pl
rename : openssl/crypto/bn/asm/co-586.pl => main/openssl/crypto/bn/asm/co-586.pl
rename : openssl/crypto/bn/asm/ia64.S => main/openssl/crypto/bn/asm/ia64.S
rename : openssl/crypto/bn/asm/mips3-mont.pl => main/openssl/crypto/bn/asm/mips3-mont.pl
rename : openssl/crypto/bn/asm/mips3.s => main/openssl/crypto/bn/asm/mips3.s
rename : openssl/crypto/bn/asm/pa-risc2.s => main/openssl/crypto/bn/asm/pa-risc2.s
rename : openssl/crypto/bn/asm/pa-risc2W.s => main/openssl/crypto/bn/asm/pa-risc2W.s
rename : openssl/crypto/bn/asm/ppc-mont.pl => main/openssl/crypto/bn/asm/ppc-mont.pl
rename : openssl/crypto/bn/asm/ppc.pl => main/openssl/crypto/bn/asm/ppc.pl
rename : openssl/crypto/bn/asm/ppc64-mont.pl => main/openssl/crypto/bn/asm/ppc64-mont.pl
rename : openssl/crypto/bn/asm/s390x-mont.pl => main/openssl/crypto/bn/asm/s390x-mont.pl
rename : openssl/crypto/bn/asm/s390x.S => main/openssl/crypto/bn/asm/s390x.S
rename : openssl/crypto/bn/asm/sparcv8.S => main/openssl/crypto/bn/asm/sparcv8.S
rename : openssl/crypto/bn/asm/sparcv8plus.S => main/openssl/crypto/bn/asm/sparcv8plus.S
rename : openssl/crypto/bn/asm/sparcv9-mont.pl => main/openssl/crypto/bn/asm/sparcv9-mont.pl
rename : openssl/crypto/bn/asm/sparcv9a-mont.pl => main/openssl/crypto/bn/asm/sparcv9a-mont.pl
rename : openssl/crypto/bn/asm/via-mont.pl => main/openssl/crypto/bn/asm/via-mont.pl
rename : openssl/crypto/bn/asm/x86-mont.pl => main/openssl/crypto/bn/asm/x86-mont.pl
rename : openssl/crypto/bn/asm/x86.pl => main/openssl/crypto/bn/asm/x86.pl
rename : openssl/crypto/bn/asm/x86/add.pl => main/openssl/crypto/bn/asm/x86/add.pl
rename : openssl/crypto/bn/asm/x86/comba.pl => main/openssl/crypto/bn/asm/x86/comba.pl
rename : openssl/crypto/bn/asm/x86/div.pl => main/openssl/crypto/bn/asm/x86/div.pl
rename : openssl/crypto/bn/asm/x86/f => main/openssl/crypto/bn/asm/x86/f
rename : openssl/crypto/bn/asm/x86/mul.pl => main/openssl/crypto/bn/asm/x86/mul.pl
rename : openssl/crypto/bn/asm/x86/mul_add.pl => main/openssl/crypto/bn/asm/x86/mul_add.pl
rename : openssl/crypto/bn/asm/x86/sqr.pl => main/openssl/crypto/bn/asm/x86/sqr.pl
rename : openssl/crypto/bn/asm/x86/sub.pl => main/openssl/crypto/bn/asm/x86/sub.pl
rename : openssl/crypto/bn/asm/x86_64-gcc.c => main/openssl/crypto/bn/asm/x86_64-gcc.c
rename : openssl/crypto/bn/asm/x86_64-mont.pl => main/openssl/crypto/bn/asm/x86_64-mont.pl
rename : openssl/crypto/bn/bn.h => main/openssl/crypto/bn/bn.h
rename : openssl/crypto/bn/bn.mul => main/openssl/crypto/bn/bn.mul
rename : openssl/crypto/bn/bn_add.c => main/openssl/crypto/bn/bn_add.c
rename : openssl/crypto/bn/bn_asm.c => main/openssl/crypto/bn/bn_asm.c
rename : openssl/crypto/bn/bn_blind.c => main/openssl/crypto/bn/bn_blind.c
rename : openssl/crypto/bn/bn_const.c => main/openssl/crypto/bn/bn_const.c
rename : openssl/crypto/bn/bn_ctx.c => main/openssl/crypto/bn/bn_ctx.c
rename : openssl/crypto/bn/bn_depr.c => main/openssl/crypto/bn/bn_depr.c
rename : openssl/crypto/bn/bn_div.c => main/openssl/crypto/bn/bn_div.c
rename : openssl/crypto/bn/bn_err.c => main/openssl/crypto/bn/bn_err.c
rename : openssl/crypto/bn/bn_exp.c => main/openssl/crypto/bn/bn_exp.c
rename : openssl/crypto/bn/bn_exp2.c => main/openssl/crypto/bn/bn_exp2.c
rename : openssl/crypto/bn/bn_gcd.c => main/openssl/crypto/bn/bn_gcd.c
rename : openssl/crypto/bn/bn_gf2m.c => main/openssl/crypto/bn/bn_gf2m.c
rename : openssl/crypto/bn/bn_kron.c => main/openssl/crypto/bn/bn_kron.c
rename : openssl/crypto/bn/bn_lcl.h => main/openssl/crypto/bn/bn_lcl.h
rename : openssl/crypto/bn/bn_lib.c => main/openssl/crypto/bn/bn_lib.c
rename : openssl/crypto/bn/bn_mod.c => main/openssl/crypto/bn/bn_mod.c
rename : openssl/crypto/bn/bn_mont.c => main/openssl/crypto/bn/bn_mont.c
rename : openssl/crypto/bn/bn_mpi.c => main/openssl/crypto/bn/bn_mpi.c
rename : openssl/crypto/bn/bn_mul.c => main/openssl/crypto/bn/bn_mul.c
rename : openssl/crypto/bn/bn_nist.c => main/openssl/crypto/bn/bn_nist.c
rename : openssl/crypto/bn/bn_prime.c => main/openssl/crypto/bn/bn_prime.c
rename : openssl/crypto/bn/bn_prime.h => main/openssl/crypto/bn/bn_prime.h
rename : openssl/crypto/bn/bn_prime.pl => main/openssl/crypto/bn/bn_prime.pl
rename : openssl/crypto/bn/bn_print.c => main/openssl/crypto/bn/bn_print.c
rename : openssl/crypto/bn/bn_rand.c => main/openssl/crypto/bn/bn_rand.c
rename : openssl/crypto/bn/bn_recp.c => main/openssl/crypto/bn/bn_recp.c
rename : openssl/crypto/bn/bn_shift.c => main/openssl/crypto/bn/bn_shift.c
rename : openssl/crypto/bn/bn_sqr.c => main/openssl/crypto/bn/bn_sqr.c
rename : openssl/crypto/bn/bn_sqrt.c => main/openssl/crypto/bn/bn_sqrt.c
rename : openssl/crypto/bn/bn_word.c => main/openssl/crypto/bn/bn_word.c
rename : openssl/crypto/bn/bnspeed.c => main/openssl/crypto/bn/bnspeed.c
rename : openssl/crypto/bn/bntest.c => main/openssl/crypto/bn/bntest.c
rename : openssl/crypto/bn/divtest.c => main/openssl/crypto/bn/divtest.c
rename : openssl/crypto/bn/exp.c => main/openssl/crypto/bn/exp.c
rename : openssl/crypto/bn/expspeed.c => main/openssl/crypto/bn/expspeed.c
rename : openssl/crypto/bn/exptest.c => main/openssl/crypto/bn/exptest.c
rename : openssl/crypto/bn/todo => main/openssl/crypto/bn/todo
rename : openssl/crypto/buffer/buf_err.c => main/openssl/crypto/buffer/buf_err.c
rename : openssl/crypto/buffer/buffer.c => main/openssl/crypto/buffer/buffer.c
rename : openssl/crypto/buffer/buffer.h => main/openssl/crypto/buffer/buffer.h
rename : openssl/crypto/comp/c_rle.c => main/openssl/crypto/comp/c_rle.c
rename : openssl/crypto/comp/c_zlib.c => main/openssl/crypto/comp/c_zlib.c
rename : openssl/crypto/comp/comp.h => main/openssl/crypto/comp/comp.h
rename : openssl/crypto/comp/comp_err.c => main/openssl/crypto/comp/comp_err.c
rename : openssl/crypto/comp/comp_lib.c => main/openssl/crypto/comp/comp_lib.c
rename : openssl/crypto/conf/README => main/openssl/crypto/conf/README
rename : openssl/crypto/conf/cnf_save.c => main/openssl/crypto/conf/cnf_save.c
rename : openssl/crypto/conf/conf.h => main/openssl/crypto/conf/conf.h
rename : openssl/crypto/conf/conf_api.c => main/openssl/crypto/conf/conf_api.c
rename : openssl/crypto/conf/conf_api.h => main/openssl/crypto/conf/conf_api.h
rename : openssl/crypto/conf/conf_def.c => main/openssl/crypto/conf/conf_def.c
rename : openssl/crypto/conf/conf_def.h => main/openssl/crypto/conf/conf_def.h
rename : openssl/crypto/conf/conf_err.c => main/openssl/crypto/conf/conf_err.c
rename : openssl/crypto/conf/conf_lib.c => main/openssl/crypto/conf/conf_lib.c
rename : openssl/crypto/conf/conf_mall.c => main/openssl/crypto/conf/conf_mall.c
rename : openssl/crypto/conf/conf_mod.c => main/openssl/crypto/conf/conf_mod.c
rename : openssl/crypto/conf/conf_sap.c => main/openssl/crypto/conf/conf_sap.c
rename : openssl/crypto/conf/keysets.pl => main/openssl/crypto/conf/keysets.pl
rename : openssl/crypto/conf/ssleay.cnf => main/openssl/crypto/conf/ssleay.cnf
rename : openssl/crypto/conf/test.c => main/openssl/crypto/conf/test.c
rename : openssl/crypto/cpt_err.c => main/openssl/crypto/cpt_err.c
rename : openssl/crypto/cryptlib.c => main/openssl/crypto/cryptlib.c
rename : openssl/crypto/cryptlib.h => main/openssl/crypto/cryptlib.h
rename : openssl/crypto/crypto.h => main/openssl/crypto/crypto.h
rename : openssl/crypto/cversion.c => main/openssl/crypto/cversion.c
rename : openssl/crypto/des/COPYRIGHT => main/openssl/crypto/des/COPYRIGHT
rename : openssl/crypto/des/DES.pm => main/openssl/crypto/des/DES.pm
rename : openssl/crypto/des/DES.xs => main/openssl/crypto/des/DES.xs
rename : openssl/crypto/des/FILES0 => main/openssl/crypto/des/FILES0
rename : openssl/crypto/des/INSTALL => main/openssl/crypto/des/INSTALL
rename : openssl/crypto/des/Imakefile => main/openssl/crypto/des/Imakefile
rename : openssl/crypto/des/KERBEROS => main/openssl/crypto/des/KERBEROS
rename : openssl/crypto/des/README => main/openssl/crypto/des/README
rename : openssl/crypto/des/VERSION => main/openssl/crypto/des/VERSION
rename : openssl/crypto/des/asm/crypt586.pl => main/openssl/crypto/des/asm/crypt586.pl
rename : openssl/crypto/des/asm/des-586.pl => main/openssl/crypto/des/asm/des-586.pl
rename : openssl/crypto/des/asm/des_enc.m4 => main/openssl/crypto/des/asm/des_enc.m4
rename : openssl/crypto/des/asm/desboth.pl => main/openssl/crypto/des/asm/desboth.pl
rename : openssl/crypto/des/asm/readme => main/openssl/crypto/des/asm/readme
rename : openssl/crypto/des/cbc3_enc.c => main/openssl/crypto/des/cbc3_enc.c
rename : openssl/crypto/des/cbc_cksm.c => main/openssl/crypto/des/cbc_cksm.c
rename : openssl/crypto/des/cbc_enc.c => main/openssl/crypto/des/cbc_enc.c
rename : openssl/crypto/des/cfb64ede.c => main/openssl/crypto/des/cfb64ede.c
rename : openssl/crypto/des/cfb64enc.c => main/openssl/crypto/des/cfb64enc.c
rename : openssl/crypto/des/cfb_enc.c => main/openssl/crypto/des/cfb_enc.c
rename : openssl/crypto/des/des.c => main/openssl/crypto/des/des.c
rename : openssl/crypto/des/des.h => main/openssl/crypto/des/des.h
rename : openssl/crypto/des/des.pod => main/openssl/crypto/des/des.pod
rename : openssl/crypto/des/des3s.cpp => main/openssl/crypto/des/des3s.cpp
rename : openssl/crypto/des/des_enc.c => main/openssl/crypto/des/des_enc.c
rename : openssl/crypto/des/des_locl.h => main/openssl/crypto/des/des_locl.h
rename : openssl/crypto/des/des_old.c => main/openssl/crypto/des/des_old.c
rename : openssl/crypto/des/des_old.h => main/openssl/crypto/des/des_old.h
rename : openssl/crypto/des/des_old2.c => main/openssl/crypto/des/des_old2.c
rename : openssl/crypto/des/des_opts.c => main/openssl/crypto/des/des_opts.c
rename : openssl/crypto/des/des_ver.h => main/openssl/crypto/des/des_ver.h
rename : openssl/crypto/des/dess.cpp => main/openssl/crypto/des/dess.cpp
rename : openssl/crypto/des/destest.c => main/openssl/crypto/des/destest.c
rename : openssl/crypto/des/ecb3_enc.c => main/openssl/crypto/des/ecb3_enc.c
rename : openssl/crypto/des/ecb_enc.c => main/openssl/crypto/des/ecb_enc.c
rename : openssl/crypto/des/ede_cbcm_enc.c => main/openssl/crypto/des/ede_cbcm_enc.c
rename : openssl/crypto/des/enc_read.c => main/openssl/crypto/des/enc_read.c
rename : openssl/crypto/des/enc_writ.c => main/openssl/crypto/des/enc_writ.c
rename : openssl/crypto/des/fcrypt.c => main/openssl/crypto/des/fcrypt.c
rename : openssl/crypto/des/fcrypt_b.c => main/openssl/crypto/des/fcrypt_b.c
rename : openssl/crypto/des/makefile.bc => main/openssl/crypto/des/makefile.bc
rename : openssl/crypto/des/ncbc_enc.c => main/openssl/crypto/des/ncbc_enc.c
rename : openssl/crypto/des/ofb64ede.c => main/openssl/crypto/des/ofb64ede.c
rename : openssl/crypto/des/ofb64enc.c => main/openssl/crypto/des/ofb64enc.c
rename : openssl/crypto/des/ofb_enc.c => main/openssl/crypto/des/ofb_enc.c
rename : openssl/crypto/des/options.txt => main/openssl/crypto/des/options.txt
rename : openssl/crypto/des/pcbc_enc.c => main/openssl/crypto/des/pcbc_enc.c
rename : openssl/crypto/des/qud_cksm.c => main/openssl/crypto/des/qud_cksm.c
rename : openssl/crypto/des/rand_key.c => main/openssl/crypto/des/rand_key.c
rename : openssl/crypto/des/read2pwd.c => main/openssl/crypto/des/read2pwd.c
rename : openssl/crypto/des/read_pwd.c => main/openssl/crypto/des/read_pwd.c
rename : openssl/crypto/des/rpc_des.h => main/openssl/crypto/des/rpc_des.h
rename : openssl/crypto/des/rpc_enc.c => main/openssl/crypto/des/rpc_enc.c
rename : openssl/crypto/des/rpw.c => main/openssl/crypto/des/rpw.c
rename : openssl/crypto/des/set_key.c => main/openssl/crypto/des/set_key.c
rename : openssl/crypto/des/speed.c => main/openssl/crypto/des/speed.c
rename : openssl/crypto/des/spr.h => main/openssl/crypto/des/spr.h
rename : openssl/crypto/des/str2key.c => main/openssl/crypto/des/str2key.c
rename : openssl/crypto/des/t/test => main/openssl/crypto/des/t/test
rename : openssl/crypto/des/times/486-50.sol => main/openssl/crypto/des/times/486-50.sol
rename : openssl/crypto/des/times/586-100.lnx => main/openssl/crypto/des/times/586-100.lnx
rename : openssl/crypto/des/times/686-200.fre => main/openssl/crypto/des/times/686-200.fre
rename : openssl/crypto/des/times/aix.cc => main/openssl/crypto/des/times/aix.cc
rename : openssl/crypto/des/times/alpha.cc => main/openssl/crypto/des/times/alpha.cc
rename : openssl/crypto/des/times/hpux.cc => main/openssl/crypto/des/times/hpux.cc
rename : openssl/crypto/des/times/sparc.gcc => main/openssl/crypto/des/times/sparc.gcc
rename : openssl/crypto/des/times/usparc.cc => main/openssl/crypto/des/times/usparc.cc
rename : openssl/crypto/des/typemap => main/openssl/crypto/des/typemap
rename : openssl/crypto/des/xcbc_enc.c => main/openssl/crypto/des/xcbc_enc.c
rename : openssl/crypto/dh/dh.h => main/openssl/crypto/dh/dh.h
rename : openssl/crypto/dh/dh1024.pem => main/openssl/crypto/dh/dh1024.pem
rename : openssl/crypto/dh/dh192.pem => main/openssl/crypto/dh/dh192.pem
rename : openssl/crypto/dh/dh2048.pem => main/openssl/crypto/dh/dh2048.pem
rename : openssl/crypto/dh/dh4096.pem => main/openssl/crypto/dh/dh4096.pem
rename : openssl/crypto/dh/dh512.pem => main/openssl/crypto/dh/dh512.pem
rename : openssl/crypto/dh/dh_ameth.c => main/openssl/crypto/dh/dh_ameth.c
rename : openssl/crypto/dh/dh_asn1.c => main/openssl/crypto/dh/dh_asn1.c
rename : openssl/crypto/dh/dh_check.c => main/openssl/crypto/dh/dh_check.c
rename : openssl/crypto/dh/dh_depr.c => main/openssl/crypto/dh/dh_depr.c
rename : openssl/crypto/dh/dh_err.c => main/openssl/crypto/dh/dh_err.c
rename : openssl/crypto/dh/dh_gen.c => main/openssl/crypto/dh/dh_gen.c
rename : openssl/crypto/dh/dh_key.c => main/openssl/crypto/dh/dh_key.c
rename : openssl/crypto/dh/dh_lib.c => main/openssl/crypto/dh/dh_lib.c
rename : openssl/crypto/dh/dh_pmeth.c => main/openssl/crypto/dh/dh_pmeth.c
rename : openssl/crypto/dh/dhtest.c => main/openssl/crypto/dh/dhtest.c
rename : openssl/crypto/dh/example => main/openssl/crypto/dh/example
rename : openssl/crypto/dh/generate => main/openssl/crypto/dh/generate
rename : openssl/crypto/dh/p1024.c => main/openssl/crypto/dh/p1024.c
rename : openssl/crypto/dh/p192.c => main/openssl/crypto/dh/p192.c
rename : openssl/crypto/dh/p512.c => main/openssl/crypto/dh/p512.c
rename : openssl/crypto/dsa/README => main/openssl/crypto/dsa/README
rename : openssl/crypto/dsa/dsa.h => main/openssl/crypto/dsa/dsa.h
rename : openssl/crypto/dsa/dsa_ameth.c => main/openssl/crypto/dsa/dsa_ameth.c
rename : openssl/crypto/dsa/dsa_asn1.c => main/openssl/crypto/dsa/dsa_asn1.c
rename : openssl/crypto/dsa/dsa_depr.c => main/openssl/crypto/dsa/dsa_depr.c
rename : openssl/crypto/dsa/dsa_err.c => main/openssl/crypto/dsa/dsa_err.c
rename : openssl/crypto/dsa/dsa_gen.c => main/openssl/crypto/dsa/dsa_gen.c
rename : openssl/crypto/dsa/dsa_key.c => main/openssl/crypto/dsa/dsa_key.c
rename : openssl/crypto/dsa/dsa_lib.c => main/openssl/crypto/dsa/dsa_lib.c
rename : openssl/crypto/dsa/dsa_locl.h => main/openssl/crypto/dsa/dsa_locl.h
rename : openssl/crypto/dsa/dsa_ossl.c => main/openssl/crypto/dsa/dsa_ossl.c
rename : openssl/crypto/dsa/dsa_pmeth.c => main/openssl/crypto/dsa/dsa_pmeth.c
rename : openssl/crypto/dsa/dsa_prn.c => main/openssl/crypto/dsa/dsa_prn.c
rename : openssl/crypto/dsa/dsa_sign.c => main/openssl/crypto/dsa/dsa_sign.c
rename : openssl/crypto/dsa/dsa_vrf.c => main/openssl/crypto/dsa/dsa_vrf.c
rename : openssl/crypto/dsa/dsagen.c => main/openssl/crypto/dsa/dsagen.c
rename : openssl/crypto/dsa/dsatest.c => main/openssl/crypto/dsa/dsatest.c
rename : openssl/crypto/dsa/fips186a.txt => main/openssl/crypto/dsa/fips186a.txt
rename : openssl/crypto/dso/README => main/openssl/crypto/dso/README
rename : openssl/crypto/dso/dso.h => main/openssl/crypto/dso/dso.h
rename : openssl/crypto/dso/dso_dl.c => main/openssl/crypto/dso/dso_dl.c
rename : openssl/crypto/dso/dso_dlfcn.c => main/openssl/crypto/dso/dso_dlfcn.c
rename : openssl/crypto/dso/dso_err.c => main/openssl/crypto/dso/dso_err.c
rename : openssl/crypto/dso/dso_lib.c => main/openssl/crypto/dso/dso_lib.c
rename : openssl/crypto/dso/dso_null.c => main/openssl/crypto/dso/dso_null.c
rename : openssl/crypto/dso/dso_openssl.c => main/openssl/crypto/dso/dso_openssl.c
rename : openssl/crypto/ebcdic.c => main/openssl/crypto/ebcdic.c
rename : openssl/crypto/ebcdic.h => main/openssl/crypto/ebcdic.h
rename : openssl/crypto/ec/ec.h => main/openssl/crypto/ec/ec.h
rename : openssl/crypto/ec/ec2_mult.c => main/openssl/crypto/ec/ec2_mult.c
rename : openssl/crypto/ec/ec2_smpl.c => main/openssl/crypto/ec/ec2_smpl.c
rename : openssl/crypto/ec/ec_ameth.c => main/openssl/crypto/ec/ec_ameth.c
rename : openssl/crypto/ec/ec_asn1.c => main/openssl/crypto/ec/ec_asn1.c
rename : openssl/crypto/ec/ec_check.c => main/openssl/crypto/ec/ec_check.c
rename : openssl/crypto/ec/ec_curve.c => main/openssl/crypto/ec/ec_curve.c
rename : openssl/crypto/ec/ec_cvt.c => main/openssl/crypto/ec/ec_cvt.c
rename : openssl/crypto/ec/ec_err.c => main/openssl/crypto/ec/ec_err.c
rename : openssl/crypto/ec/ec_key.c => main/openssl/crypto/ec/ec_key.c
rename : openssl/crypto/ec/ec_lcl.h => main/openssl/crypto/ec/ec_lcl.h
rename : openssl/crypto/ec/ec_lib.c => main/openssl/crypto/ec/ec_lib.c
rename : openssl/crypto/ec/ec_mult.c => main/openssl/crypto/ec/ec_mult.c
rename : openssl/crypto/ec/ec_pmeth.c => main/openssl/crypto/ec/ec_pmeth.c
rename : openssl/crypto/ec/ec_print.c => main/openssl/crypto/ec/ec_print.c
rename : openssl/crypto/ec/eck_prn.c => main/openssl/crypto/ec/eck_prn.c
rename : openssl/crypto/ec/ecp_mont.c => main/openssl/crypto/ec/ecp_mont.c
rename : openssl/crypto/ec/ecp_nist.c => main/openssl/crypto/ec/ecp_nist.c
rename : openssl/crypto/ec/ecp_smpl.c => main/openssl/crypto/ec/ecp_smpl.c
rename : openssl/crypto/ec/ectest.c => main/openssl/crypto/ec/ectest.c
rename : openssl/crypto/ecdh/ecdh.h => main/openssl/crypto/ecdh/ecdh.h
rename : openssl/crypto/ecdh/ecdhtest.c => main/openssl/crypto/ecdh/ecdhtest.c
rename : openssl/crypto/ecdh/ech_err.c => main/openssl/crypto/ecdh/ech_err.c
rename : openssl/crypto/ecdh/ech_key.c => main/openssl/crypto/ecdh/ech_key.c
rename : openssl/crypto/ecdh/ech_lib.c => main/openssl/crypto/ecdh/ech_lib.c
rename : openssl/crypto/ecdh/ech_locl.h => main/openssl/crypto/ecdh/ech_locl.h
rename : openssl/crypto/ecdh/ech_ossl.c => main/openssl/crypto/ecdh/ech_ossl.c
rename : openssl/crypto/ecdsa/ecdsa.h => main/openssl/crypto/ecdsa/ecdsa.h
rename : openssl/crypto/ecdsa/ecdsatest.c => main/openssl/crypto/ecdsa/ecdsatest.c
rename : openssl/crypto/ecdsa/ecs_asn1.c => main/openssl/crypto/ecdsa/ecs_asn1.c
rename : openssl/crypto/ecdsa/ecs_err.c => main/openssl/crypto/ecdsa/ecs_err.c
rename : openssl/crypto/ecdsa/ecs_lib.c => main/openssl/crypto/ecdsa/ecs_lib.c
rename : openssl/crypto/ecdsa/ecs_locl.h => main/openssl/crypto/ecdsa/ecs_locl.h
rename : openssl/crypto/ecdsa/ecs_ossl.c => main/openssl/crypto/ecdsa/ecs_ossl.c
rename : openssl/crypto/ecdsa/ecs_sign.c => main/openssl/crypto/ecdsa/ecs_sign.c
rename : openssl/crypto/ecdsa/ecs_vrf.c => main/openssl/crypto/ecdsa/ecs_vrf.c
rename : openssl/crypto/engine/README => main/openssl/crypto/engine/README
rename : openssl/crypto/engine/eng_all.c => main/openssl/crypto/engine/eng_all.c
rename : openssl/crypto/engine/eng_cnf.c => main/openssl/crypto/engine/eng_cnf.c
rename : openssl/crypto/engine/eng_cryptodev.c => main/openssl/crypto/engine/eng_cryptodev.c
rename : openssl/crypto/engine/eng_ctrl.c => main/openssl/crypto/engine/eng_ctrl.c
rename : openssl/crypto/engine/eng_dyn.c => main/openssl/crypto/engine/eng_dyn.c
rename : openssl/crypto/engine/eng_err.c => main/openssl/crypto/engine/eng_err.c
rename : openssl/crypto/engine/eng_fat.c => main/openssl/crypto/engine/eng_fat.c
rename : openssl/crypto/engine/eng_init.c => main/openssl/crypto/engine/eng_init.c
rename : openssl/crypto/engine/eng_int.h => main/openssl/crypto/engine/eng_int.h
rename : openssl/crypto/engine/eng_lib.c => main/openssl/crypto/engine/eng_lib.c
rename : openssl/crypto/engine/eng_list.c => main/openssl/crypto/engine/eng_list.c
rename : openssl/crypto/engine/eng_openssl.c => main/openssl/crypto/engine/eng_openssl.c
rename : openssl/crypto/engine/eng_pkey.c => main/openssl/crypto/engine/eng_pkey.c
rename : openssl/crypto/engine/eng_table.c => main/openssl/crypto/engine/eng_table.c
rename : openssl/crypto/engine/engine.h => main/openssl/crypto/engine/engine.h
rename : openssl/crypto/engine/enginetest.c => main/openssl/crypto/engine/enginetest.c
rename : openssl/crypto/engine/tb_cipher.c => main/openssl/crypto/engine/tb_cipher.c
rename : openssl/crypto/engine/tb_dh.c => main/openssl/crypto/engine/tb_dh.c
rename : openssl/crypto/engine/tb_digest.c => main/openssl/crypto/engine/tb_digest.c
rename : openssl/crypto/engine/tb_dsa.c => main/openssl/crypto/engine/tb_dsa.c
rename : openssl/crypto/engine/tb_ecdh.c => main/openssl/crypto/engine/tb_ecdh.c
rename : openssl/crypto/engine/tb_ecdsa.c => main/openssl/crypto/engine/tb_ecdsa.c
rename : openssl/crypto/engine/tb_rand.c => main/openssl/crypto/engine/tb_rand.c
rename : openssl/crypto/engine/tb_rsa.c => main/openssl/crypto/engine/tb_rsa.c
rename : openssl/crypto/engine/tb_store.c => main/openssl/crypto/engine/tb_store.c
rename : openssl/crypto/err/err.c => main/openssl/crypto/err/err.c
rename : openssl/crypto/err/err.h => main/openssl/crypto/err/err.h
rename : openssl/crypto/err/err_all.c => main/openssl/crypto/err/err_all.c
rename : openssl/crypto/err/err_prn.c => main/openssl/crypto/err/err_prn.c
rename : openssl/crypto/err/openssl.ec => main/openssl/crypto/err/openssl.ec
rename : openssl/crypto/evp/bio_b64.c => main/openssl/crypto/evp/bio_b64.c
rename : openssl/crypto/evp/bio_enc.c => main/openssl/crypto/evp/bio_enc.c
rename : openssl/crypto/evp/bio_md.c => main/openssl/crypto/evp/bio_md.c
rename : openssl/crypto/evp/bio_ok.c => main/openssl/crypto/evp/bio_ok.c
rename : openssl/crypto/evp/c_all.c => main/openssl/crypto/evp/c_all.c
rename : openssl/crypto/evp/c_allc.c => main/openssl/crypto/evp/c_allc.c
rename : openssl/crypto/evp/c_alld.c => main/openssl/crypto/evp/c_alld.c
rename : openssl/crypto/evp/digest.c => main/openssl/crypto/evp/digest.c
rename : openssl/crypto/evp/e_aes.c => main/openssl/crypto/evp/e_aes.c
rename : openssl/crypto/evp/e_bf.c => main/openssl/crypto/evp/e_bf.c
rename : openssl/crypto/evp/e_camellia.c => main/openssl/crypto/evp/e_camellia.c
rename : openssl/crypto/evp/e_cast.c => main/openssl/crypto/evp/e_cast.c
rename : openssl/crypto/evp/e_des.c => main/openssl/crypto/evp/e_des.c
rename : openssl/crypto/evp/e_des3.c => main/openssl/crypto/evp/e_des3.c
rename : openssl/crypto/evp/e_dsa.c => main/openssl/crypto/evp/e_dsa.c
rename : openssl/crypto/evp/e_idea.c => main/openssl/crypto/evp/e_idea.c
rename : openssl/crypto/evp/e_null.c => main/openssl/crypto/evp/e_null.c
rename : openssl/crypto/evp/e_old.c => main/openssl/crypto/evp/e_old.c
rename : openssl/crypto/evp/e_rc2.c => main/openssl/crypto/evp/e_rc2.c
rename : openssl/crypto/evp/e_rc4.c => main/openssl/crypto/evp/e_rc4.c
rename : openssl/crypto/evp/e_rc5.c => main/openssl/crypto/evp/e_rc5.c
rename : openssl/crypto/evp/e_seed.c => main/openssl/crypto/evp/e_seed.c
rename : openssl/crypto/evp/e_xcbc_d.c => main/openssl/crypto/evp/e_xcbc_d.c
rename : openssl/crypto/evp/encode.c => main/openssl/crypto/evp/encode.c
rename : openssl/crypto/evp/evp.h => main/openssl/crypto/evp/evp.h
rename : openssl/crypto/evp/evp_acnf.c => main/openssl/crypto/evp/evp_acnf.c
rename : openssl/crypto/evp/evp_enc.c => main/openssl/crypto/evp/evp_enc.c
rename : openssl/crypto/evp/evp_err.c => main/openssl/crypto/evp/evp_err.c
rename : openssl/crypto/evp/evp_key.c => main/openssl/crypto/evp/evp_key.c
rename : openssl/crypto/evp/evp_lib.c => main/openssl/crypto/evp/evp_lib.c
rename : openssl/crypto/evp/evp_locl.h => main/openssl/crypto/evp/evp_locl.h
rename : openssl/crypto/evp/evp_pbe.c => main/openssl/crypto/evp/evp_pbe.c
rename : openssl/crypto/evp/evp_pkey.c => main/openssl/crypto/evp/evp_pkey.c
rename : openssl/crypto/evp/evp_test.c => main/openssl/crypto/evp/evp_test.c
rename : openssl/crypto/evp/evptests.txt => main/openssl/crypto/evp/evptests.txt
rename : openssl/crypto/evp/m_dss.c => main/openssl/crypto/evp/m_dss.c
rename : openssl/crypto/evp/m_dss1.c => main/openssl/crypto/evp/m_dss1.c
rename : openssl/crypto/evp/m_ecdsa.c => main/openssl/crypto/evp/m_ecdsa.c
rename : openssl/crypto/evp/m_md4.c => main/openssl/crypto/evp/m_md4.c
rename : openssl/crypto/evp/m_md5.c => main/openssl/crypto/evp/m_md5.c
rename : openssl/crypto/evp/m_mdc2.c => main/openssl/crypto/evp/m_mdc2.c
rename : openssl/crypto/evp/m_null.c => main/openssl/crypto/evp/m_null.c
rename : openssl/crypto/evp/m_ripemd.c => main/openssl/crypto/evp/m_ripemd.c
rename : openssl/crypto/evp/m_sha1.c => main/openssl/crypto/evp/m_sha1.c
rename : openssl/crypto/evp/m_sigver.c => main/openssl/crypto/evp/m_sigver.c
rename : openssl/crypto/evp/m_wp.c => main/openssl/crypto/evp/m_wp.c
rename : openssl/crypto/evp/names.c => main/openssl/crypto/evp/names.c
rename : openssl/crypto/evp/openbsd_hw.c => main/openssl/crypto/evp/openbsd_hw.c
rename : openssl/crypto/evp/p5_crpt.c => main/openssl/crypto/evp/p5_crpt.c
rename : openssl/crypto/evp/p5_crpt2.c => main/openssl/crypto/evp/p5_crpt2.c
rename : openssl/crypto/evp/p_dec.c => main/openssl/crypto/evp/p_dec.c
rename : openssl/crypto/evp/p_enc.c => main/openssl/crypto/evp/p_enc.c
rename : openssl/crypto/evp/p_lib.c => main/openssl/crypto/evp/p_lib.c
rename : openssl/crypto/evp/p_open.c => main/openssl/crypto/evp/p_open.c
rename : openssl/crypto/evp/p_seal.c => main/openssl/crypto/evp/p_seal.c
rename : openssl/crypto/evp/p_sign.c => main/openssl/crypto/evp/p_sign.c
rename : openssl/crypto/evp/p_verify.c => main/openssl/crypto/evp/p_verify.c
rename : openssl/crypto/evp/pmeth_fn.c => main/openssl/crypto/evp/pmeth_fn.c
rename : openssl/crypto/evp/pmeth_gn.c => main/openssl/crypto/evp/pmeth_gn.c
rename : openssl/crypto/evp/pmeth_lib.c => main/openssl/crypto/evp/pmeth_lib.c
rename : openssl/crypto/ex_data.c => main/openssl/crypto/ex_data.c
rename : openssl/crypto/hmac/hm_ameth.c => main/openssl/crypto/hmac/hm_ameth.c
rename : openssl/crypto/hmac/hm_pmeth.c => main/openssl/crypto/hmac/hm_pmeth.c
rename : openssl/crypto/hmac/hmac.c => main/openssl/crypto/hmac/hmac.c
rename : openssl/crypto/hmac/hmac.h => main/openssl/crypto/hmac/hmac.h
rename : openssl/crypto/hmac/hmactest.c => main/openssl/crypto/hmac/hmactest.c
rename : openssl/crypto/ia64cpuid.S => main/openssl/crypto/ia64cpuid.S
rename : openssl/crypto/jpake/jpake.c => main/openssl/crypto/jpake/jpake.c
rename : openssl/crypto/jpake/jpake.h => main/openssl/crypto/jpake/jpake.h
rename : openssl/crypto/jpake/jpake_err.c => main/openssl/crypto/jpake/jpake_err.c
rename : openssl/crypto/jpake/jpaketest.c => main/openssl/crypto/jpake/jpaketest.c
rename : openssl/crypto/krb5/krb5_asn.c => main/openssl/crypto/krb5/krb5_asn.c
rename : openssl/crypto/krb5/krb5_asn.h => main/openssl/crypto/krb5/krb5_asn.h
rename : openssl/crypto/lhash/lh_stats.c => main/openssl/crypto/lhash/lh_stats.c
rename : openssl/crypto/lhash/lh_test.c => main/openssl/crypto/lhash/lh_test.c
rename : openssl/crypto/lhash/lhash.c => main/openssl/crypto/lhash/lhash.c
rename : openssl/crypto/lhash/lhash.h => main/openssl/crypto/lhash/lhash.h
rename : openssl/crypto/lhash/num.pl => main/openssl/crypto/lhash/num.pl
rename : openssl/crypto/md32_common.h => main/openssl/crypto/md32_common.h
rename : openssl/crypto/md4/md4.c => main/openssl/crypto/md4/md4.c
rename : openssl/crypto/md4/md4.h => main/openssl/crypto/md4/md4.h
rename : openssl/crypto/md4/md4_dgst.c => main/openssl/crypto/md4/md4_dgst.c
rename : openssl/crypto/md4/md4_locl.h => main/openssl/crypto/md4/md4_locl.h
rename : openssl/crypto/md4/md4_one.c => main/openssl/crypto/md4/md4_one.c
rename : openssl/crypto/md4/md4s.cpp => main/openssl/crypto/md4/md4s.cpp
rename : openssl/crypto/md4/md4test.c => main/openssl/crypto/md4/md4test.c
rename : openssl/crypto/md5/asm/md5-586.pl => main/openssl/crypto/md5/asm/md5-586.pl
rename : openssl/crypto/md5/asm/md5-ia64.S => main/openssl/crypto/md5/asm/md5-ia64.S
rename : openssl/crypto/md5/asm/md5-x86_64.pl => main/openssl/crypto/md5/asm/md5-x86_64.pl
rename : openssl/crypto/md5/md5.c => main/openssl/crypto/md5/md5.c
rename : openssl/crypto/md5/md5.h => main/openssl/crypto/md5/md5.h
rename : openssl/crypto/md5/md5_dgst.c => main/openssl/crypto/md5/md5_dgst.c
rename : openssl/crypto/md5/md5_locl.h => main/openssl/crypto/md5/md5_locl.h
rename : openssl/crypto/md5/md5_one.c => main/openssl/crypto/md5/md5_one.c
rename : openssl/crypto/md5/md5s.cpp => main/openssl/crypto/md5/md5s.cpp
rename : openssl/crypto/md5/md5test.c => main/openssl/crypto/md5/md5test.c
rename : openssl/crypto/mdc2/mdc2.h => main/openssl/crypto/mdc2/mdc2.h
rename : openssl/crypto/mdc2/mdc2_one.c => main/openssl/crypto/mdc2/mdc2_one.c
rename : openssl/crypto/mdc2/mdc2dgst.c => main/openssl/crypto/mdc2/mdc2dgst.c
rename : openssl/crypto/mdc2/mdc2test.c => main/openssl/crypto/mdc2/mdc2test.c
rename : openssl/crypto/mem.c => main/openssl/crypto/mem.c
rename : openssl/crypto/mem_clr.c => main/openssl/crypto/mem_clr.c
rename : openssl/crypto/mem_dbg.c => main/openssl/crypto/mem_dbg.c
rename : openssl/crypto/modes/cbc128.c => main/openssl/crypto/modes/cbc128.c
rename : openssl/crypto/modes/cfb128.c => main/openssl/crypto/modes/cfb128.c
rename : openssl/crypto/modes/ctr128.c => main/openssl/crypto/modes/ctr128.c
rename : openssl/crypto/modes/ofb128.c => main/openssl/crypto/modes/ofb128.c
rename : openssl/crypto/o_dir.c => main/openssl/crypto/o_dir.c
rename : openssl/crypto/o_dir.h => main/openssl/crypto/o_dir.h
rename : openssl/crypto/o_dir_test.c => main/openssl/crypto/o_dir_test.c
rename : openssl/crypto/o_str.c => main/openssl/crypto/o_str.c
rename : openssl/crypto/o_str.h => main/openssl/crypto/o_str.h
rename : openssl/crypto/o_time.c => main/openssl/crypto/o_time.c
rename : openssl/crypto/o_time.h => main/openssl/crypto/o_time.h
rename : openssl/crypto/objects/o_names.c => main/openssl/crypto/objects/o_names.c
rename : openssl/crypto/objects/obj_dat.c => main/openssl/crypto/objects/obj_dat.c
rename : openssl/crypto/objects/obj_dat.h => main/openssl/crypto/objects/obj_dat.h
rename : openssl/crypto/objects/obj_dat.pl => main/openssl/crypto/objects/obj_dat.pl
rename : openssl/crypto/objects/obj_err.c => main/openssl/crypto/objects/obj_err.c
rename : openssl/crypto/objects/obj_lib.c => main/openssl/crypto/objects/obj_lib.c
rename : openssl/crypto/objects/obj_mac.h => main/openssl/crypto/objects/obj_mac.h
rename : openssl/crypto/objects/obj_mac.num => main/openssl/crypto/objects/obj_mac.num
rename : openssl/crypto/objects/obj_xref.c => main/openssl/crypto/objects/obj_xref.c
rename : openssl/crypto/objects/obj_xref.h => main/openssl/crypto/objects/obj_xref.h
rename : openssl/crypto/objects/obj_xref.txt => main/openssl/crypto/objects/obj_xref.txt
rename : openssl/crypto/objects/objects.README => main/openssl/crypto/objects/objects.README
rename : openssl/crypto/objects/objects.h => main/openssl/crypto/objects/objects.h
rename : openssl/crypto/objects/objects.pl => main/openssl/crypto/objects/objects.pl
rename : openssl/crypto/objects/objects.txt => main/openssl/crypto/objects/objects.txt
rename : openssl/crypto/objects/objxref.pl => main/openssl/crypto/objects/objxref.pl
rename : openssl/crypto/ocsp/ocsp.h => main/openssl/crypto/ocsp/ocsp.h
rename : openssl/crypto/ocsp/ocsp_asn.c => main/openssl/crypto/ocsp/ocsp_asn.c
rename : openssl/crypto/ocsp/ocsp_cl.c => main/openssl/crypto/ocsp/ocsp_cl.c
rename : openssl/crypto/ocsp/ocsp_err.c => main/openssl/crypto/ocsp/ocsp_err.c
rename : openssl/crypto/ocsp/ocsp_ext.c => main/openssl/crypto/ocsp/ocsp_ext.c
rename : openssl/crypto/ocsp/ocsp_ht.c => main/openssl/crypto/ocsp/ocsp_ht.c
rename : openssl/crypto/ocsp/ocsp_lib.c => main/openssl/crypto/ocsp/ocsp_lib.c
rename : openssl/crypto/ocsp/ocsp_prn.c => main/openssl/crypto/ocsp/ocsp_prn.c
rename : openssl/crypto/ocsp/ocsp_srv.c => main/openssl/crypto/ocsp/ocsp_srv.c
rename : openssl/crypto/ocsp/ocsp_vfy.c => main/openssl/crypto/ocsp/ocsp_vfy.c
rename : openssl/crypto/opensslconf.h => main/openssl/crypto/opensslconf.h
rename : openssl/crypto/opensslconf.h.in => main/openssl/crypto/opensslconf.h.in
rename : openssl/crypto/opensslv.h => main/openssl/crypto/opensslv.h
rename : openssl/crypto/ossl_typ.h => main/openssl/crypto/ossl_typ.h
rename : openssl/crypto/pem/message => main/openssl/crypto/pem/message
rename : openssl/crypto/pem/pem.h => main/openssl/crypto/pem/pem.h
rename : openssl/crypto/pem/pem2.h => main/openssl/crypto/pem/pem2.h
rename : openssl/crypto/pem/pem_all.c => main/openssl/crypto/pem/pem_all.c
rename : openssl/crypto/pem/pem_err.c => main/openssl/crypto/pem/pem_err.c
rename : openssl/crypto/pem/pem_info.c => main/openssl/crypto/pem/pem_info.c
rename : openssl/crypto/pem/pem_lib.c => main/openssl/crypto/pem/pem_lib.c
rename : openssl/crypto/pem/pem_oth.c => main/openssl/crypto/pem/pem_oth.c
rename : openssl/crypto/pem/pem_pk8.c => main/openssl/crypto/pem/pem_pk8.c
rename : openssl/crypto/pem/pem_pkey.c => main/openssl/crypto/pem/pem_pkey.c
rename : openssl/crypto/pem/pem_seal.c => main/openssl/crypto/pem/pem_seal.c
rename : openssl/crypto/pem/pem_sign.c => main/openssl/crypto/pem/pem_sign.c
rename : openssl/crypto/pem/pem_x509.c => main/openssl/crypto/pem/pem_x509.c
rename : openssl/crypto/pem/pem_xaux.c => main/openssl/crypto/pem/pem_xaux.c
rename : openssl/crypto/pem/pkcs7.lis => main/openssl/crypto/pem/pkcs7.lis
rename : openssl/crypto/pem/pvkfmt.c => main/openssl/crypto/pem/pvkfmt.c
rename : openssl/crypto/perlasm/cbc.pl => main/openssl/crypto/perlasm/cbc.pl
rename : openssl/crypto/perlasm/ppc-xlate.pl => main/openssl/crypto/perlasm/ppc-xlate.pl
rename : openssl/crypto/perlasm/readme => main/openssl/crypto/perlasm/readme
rename : openssl/crypto/perlasm/x86_64-xlate.pl => main/openssl/crypto/perlasm/x86_64-xlate.pl
rename : openssl/crypto/perlasm/x86asm.pl => main/openssl/crypto/perlasm/x86asm.pl
rename : openssl/crypto/perlasm/x86gas.pl => main/openssl/crypto/perlasm/x86gas.pl
rename : openssl/crypto/perlasm/x86masm.pl => main/openssl/crypto/perlasm/x86masm.pl
rename : openssl/crypto/perlasm/x86nasm.pl => main/openssl/crypto/perlasm/x86nasm.pl
rename : openssl/crypto/pkcs12/p12_add.c => main/openssl/crypto/pkcs12/p12_add.c
rename : openssl/crypto/pkcs12/p12_asn.c => main/openssl/crypto/pkcs12/p12_asn.c
rename : openssl/crypto/pkcs12/p12_attr.c => main/openssl/crypto/pkcs12/p12_attr.c
rename : openssl/crypto/pkcs12/p12_crpt.c => main/openssl/crypto/pkcs12/p12_crpt.c
rename : openssl/crypto/pkcs12/p12_crt.c => main/openssl/crypto/pkcs12/p12_crt.c
rename : openssl/crypto/pkcs12/p12_decr.c => main/openssl/crypto/pkcs12/p12_decr.c
rename : openssl/crypto/pkcs12/p12_init.c => main/openssl/crypto/pkcs12/p12_init.c
rename : openssl/crypto/pkcs12/p12_key.c => main/openssl/crypto/pkcs12/p12_key.c
rename : openssl/crypto/pkcs12/p12_kiss.c => main/openssl/crypto/pkcs12/p12_kiss.c
rename : openssl/crypto/pkcs12/p12_mutl.c => main/openssl/crypto/pkcs12/p12_mutl.c
rename : openssl/crypto/pkcs12/p12_npas.c => main/openssl/crypto/pkcs12/p12_npas.c
rename : openssl/crypto/pkcs12/p12_p8d.c => main/openssl/crypto/pkcs12/p12_p8d.c
rename : openssl/crypto/pkcs12/p12_p8e.c => main/openssl/crypto/pkcs12/p12_p8e.c
rename : openssl/crypto/pkcs12/p12_utl.c => main/openssl/crypto/pkcs12/p12_utl.c
rename : openssl/crypto/pkcs12/pk12err.c => main/openssl/crypto/pkcs12/pk12err.c
rename : openssl/crypto/pkcs12/pkcs12.h => main/openssl/crypto/pkcs12/pkcs12.h
rename : openssl/crypto/pkcs7/bio_ber.c => main/openssl/crypto/pkcs7/bio_ber.c
rename : openssl/crypto/pkcs7/dec.c => main/openssl/crypto/pkcs7/dec.c
rename : openssl/crypto/pkcs7/des.pem => main/openssl/crypto/pkcs7/des.pem
rename : openssl/crypto/pkcs7/doc => main/openssl/crypto/pkcs7/doc
rename : openssl/crypto/pkcs7/enc.c => main/openssl/crypto/pkcs7/enc.c
rename : openssl/crypto/pkcs7/es1.pem => main/openssl/crypto/pkcs7/es1.pem
rename : openssl/crypto/pkcs7/example.c => main/openssl/crypto/pkcs7/example.c
rename : openssl/crypto/pkcs7/example.h => main/openssl/crypto/pkcs7/example.h
rename : openssl/crypto/pkcs7/info.pem => main/openssl/crypto/pkcs7/info.pem
rename : openssl/crypto/pkcs7/infokey.pem => main/openssl/crypto/pkcs7/infokey.pem
rename : openssl/crypto/pkcs7/p7/a1 => main/openssl/crypto/pkcs7/p7/a1
rename : openssl/crypto/pkcs7/p7/a2 => main/openssl/crypto/pkcs7/p7/a2
rename : openssl/crypto/pkcs7/p7/cert.p7c => main/openssl/crypto/pkcs7/p7/cert.p7c
rename : openssl/crypto/pkcs7/p7/smime.p7m => main/openssl/crypto/pkcs7/p7/smime.p7m
rename : openssl/crypto/pkcs7/p7/smime.p7s => main/openssl/crypto/pkcs7/p7/smime.p7s
rename : openssl/crypto/pkcs7/pk7_asn1.c => main/openssl/crypto/pkcs7/pk7_asn1.c
rename : openssl/crypto/pkcs7/pk7_attr.c => main/openssl/crypto/pkcs7/pk7_attr.c
rename : openssl/crypto/pkcs7/pk7_dgst.c => main/openssl/crypto/pkcs7/pk7_dgst.c
rename : openssl/crypto/pkcs7/pk7_doit.c => main/openssl/crypto/pkcs7/pk7_doit.c
rename : openssl/crypto/pkcs7/pk7_enc.c => main/openssl/crypto/pkcs7/pk7_enc.c
rename : openssl/crypto/pkcs7/pk7_lib.c => main/openssl/crypto/pkcs7/pk7_lib.c
rename : openssl/crypto/pkcs7/pk7_mime.c => main/openssl/crypto/pkcs7/pk7_mime.c
rename : openssl/crypto/pkcs7/pk7_smime.c => main/openssl/crypto/pkcs7/pk7_smime.c
rename : openssl/crypto/pkcs7/pkcs7.h => main/openssl/crypto/pkcs7/pkcs7.h
rename : openssl/crypto/pkcs7/pkcs7err.c => main/openssl/crypto/pkcs7/pkcs7err.c
rename : openssl/crypto/pkcs7/server.pem => main/openssl/crypto/pkcs7/server.pem
rename : openssl/crypto/pkcs7/sign.c => main/openssl/crypto/pkcs7/sign.c
rename : openssl/crypto/pkcs7/t/3des.pem => main/openssl/crypto/pkcs7/t/3des.pem
rename : openssl/crypto/pkcs7/t/3dess.pem => main/openssl/crypto/pkcs7/t/3dess.pem
rename : openssl/crypto/pkcs7/t/c.pem => main/openssl/crypto/pkcs7/t/c.pem
rename : openssl/crypto/pkcs7/t/ff => main/openssl/crypto/pkcs7/t/ff
rename : openssl/crypto/pkcs7/t/msie-e => main/openssl/crypto/pkcs7/t/msie-e
rename : openssl/crypto/pkcs7/t/msie-e.pem => main/openssl/crypto/pkcs7/t/msie-e.pem
rename : openssl/crypto/pkcs7/t/msie-enc-01 => main/openssl/crypto/pkcs7/t/msie-enc-01
rename : openssl/crypto/pkcs7/t/msie-enc-01.pem => main/openssl/crypto/pkcs7/t/msie-enc-01.pem
rename : openssl/crypto/pkcs7/t/msie-enc-02 => main/openssl/crypto/pkcs7/t/msie-enc-02
rename : openssl/crypto/pkcs7/t/msie-enc-02.pem => main/openssl/crypto/pkcs7/t/msie-enc-02.pem
rename : openssl/crypto/pkcs7/t/msie-s-a-e => main/openssl/crypto/pkcs7/t/msie-s-a-e
rename : openssl/crypto/pkcs7/t/msie-s-a-e.pem => main/openssl/crypto/pkcs7/t/msie-s-a-e.pem
rename : openssl/crypto/pkcs7/t/nav-smime => main/openssl/crypto/pkcs7/t/nav-smime
rename : openssl/crypto/pkcs7/t/s.pem => main/openssl/crypto/pkcs7/t/s.pem
rename : openssl/crypto/pkcs7/t/server.pem => main/openssl/crypto/pkcs7/t/server.pem
rename : openssl/crypto/pkcs7/verify.c => main/openssl/crypto/pkcs7/verify.c
rename : openssl/crypto/ppccpuid.pl => main/openssl/crypto/ppccpuid.pl
rename : openssl/crypto/pqueue/pq_test.c => main/openssl/crypto/pqueue/pq_test.c
rename : openssl/crypto/pqueue/pqueue.c => main/openssl/crypto/pqueue/pqueue.c
rename : openssl/crypto/pqueue/pqueue.h => main/openssl/crypto/pqueue/pqueue.h
rename : openssl/crypto/rand/md_rand.c => main/openssl/crypto/rand/md_rand.c
rename : openssl/crypto/rand/rand.h => main/openssl/crypto/rand/rand.h
rename : openssl/crypto/rand/rand_egd.c => main/openssl/crypto/rand/rand_egd.c
rename : openssl/crypto/rand/rand_err.c => main/openssl/crypto/rand/rand_err.c
rename : openssl/crypto/rand/rand_lcl.h => main/openssl/crypto/rand/rand_lcl.h
rename : openssl/crypto/rand/rand_lib.c => main/openssl/crypto/rand/rand_lib.c
rename : openssl/crypto/rand/rand_nw.c => main/openssl/crypto/rand/rand_nw.c
rename : openssl/crypto/rand/rand_os2.c => main/openssl/crypto/rand/rand_os2.c
rename : openssl/crypto/rand/rand_unix.c => main/openssl/crypto/rand/rand_unix.c
rename : openssl/crypto/rand/rand_win.c => main/openssl/crypto/rand/rand_win.c
rename : openssl/crypto/rand/randfile.c => main/openssl/crypto/rand/randfile.c
rename : openssl/crypto/rand/randtest.c => main/openssl/crypto/rand/randtest.c
rename : openssl/crypto/rc2/rc2.h => main/openssl/crypto/rc2/rc2.h
rename : openssl/crypto/rc2/rc2_cbc.c => main/openssl/crypto/rc2/rc2_cbc.c
rename : openssl/crypto/rc2/rc2_ecb.c => main/openssl/crypto/rc2/rc2_ecb.c
rename : openssl/crypto/rc2/rc2_locl.h => main/openssl/crypto/rc2/rc2_locl.h
rename : openssl/crypto/rc2/rc2_skey.c => main/openssl/crypto/rc2/rc2_skey.c
rename : openssl/crypto/rc2/rc2cfb64.c => main/openssl/crypto/rc2/rc2cfb64.c
rename : openssl/crypto/rc2/rc2ofb64.c => main/openssl/crypto/rc2/rc2ofb64.c
rename : openssl/crypto/rc2/rc2speed.c => main/openssl/crypto/rc2/rc2speed.c
rename : openssl/crypto/rc2/rc2test.c => main/openssl/crypto/rc2/rc2test.c
rename : openssl/crypto/rc2/rrc2.doc => main/openssl/crypto/rc2/rrc2.doc
rename : openssl/crypto/rc2/tab.c => main/openssl/crypto/rc2/tab.c
rename : openssl/crypto/rc2/version => main/openssl/crypto/rc2/version
rename : openssl/crypto/rc4/asm/rc4-586.pl => main/openssl/crypto/rc4/asm/rc4-586.pl
rename : openssl/crypto/rc4/asm/rc4-ia64.pl => main/openssl/crypto/rc4/asm/rc4-ia64.pl
rename : openssl/crypto/rc4/asm/rc4-s390x.pl => main/openssl/crypto/rc4/asm/rc4-s390x.pl
rename : openssl/crypto/rc4/asm/rc4-x86_64.pl => main/openssl/crypto/rc4/asm/rc4-x86_64.pl
rename : openssl/crypto/rc4/rc4.c => main/openssl/crypto/rc4/rc4.c
rename : openssl/crypto/rc4/rc4.h => main/openssl/crypto/rc4/rc4.h
rename : openssl/crypto/rc4/rc4_enc.c => main/openssl/crypto/rc4/rc4_enc.c
rename : openssl/crypto/rc4/rc4_locl.h => main/openssl/crypto/rc4/rc4_locl.h
rename : openssl/crypto/rc4/rc4_skey.c => main/openssl/crypto/rc4/rc4_skey.c
rename : openssl/crypto/rc4/rc4s.cpp => main/openssl/crypto/rc4/rc4s.cpp
rename : openssl/crypto/rc4/rc4speed.c => main/openssl/crypto/rc4/rc4speed.c
rename : openssl/crypto/rc4/rc4test.c => main/openssl/crypto/rc4/rc4test.c
rename : openssl/crypto/rc4/rrc4.doc => main/openssl/crypto/rc4/rrc4.doc
rename : openssl/crypto/ripemd/README => main/openssl/crypto/ripemd/README
rename : openssl/crypto/ripemd/asm/rips.cpp => main/openssl/crypto/ripemd/asm/rips.cpp
rename : openssl/crypto/ripemd/asm/rmd-586.pl => main/openssl/crypto/ripemd/asm/rmd-586.pl
rename : openssl/crypto/ripemd/ripemd.h => main/openssl/crypto/ripemd/ripemd.h
rename : openssl/crypto/ripemd/rmd160.c => main/openssl/crypto/ripemd/rmd160.c
rename : openssl/crypto/ripemd/rmd_dgst.c => main/openssl/crypto/ripemd/rmd_dgst.c
rename : openssl/crypto/ripemd/rmd_locl.h => main/openssl/crypto/ripemd/rmd_locl.h
rename : openssl/crypto/ripemd/rmd_one.c => main/openssl/crypto/ripemd/rmd_one.c
rename : openssl/crypto/ripemd/rmdconst.h => main/openssl/crypto/ripemd/rmdconst.h
rename : openssl/crypto/ripemd/rmdtest.c => main/openssl/crypto/ripemd/rmdtest.c
rename : openssl/crypto/rsa/rsa.h => main/openssl/crypto/rsa/rsa.h
rename : openssl/crypto/rsa/rsa_ameth.c => main/openssl/crypto/rsa/rsa_ameth.c
rename : openssl/crypto/rsa/rsa_asn1.c => main/openssl/crypto/rsa/rsa_asn1.c
rename : openssl/crypto/rsa/rsa_chk.c => main/openssl/crypto/rsa/rsa_chk.c
rename : openssl/crypto/rsa/rsa_depr.c => main/openssl/crypto/rsa/rsa_depr.c
rename : openssl/crypto/rsa/rsa_eay.c => main/openssl/crypto/rsa/rsa_eay.c
rename : openssl/crypto/rsa/rsa_err.c => main/openssl/crypto/rsa/rsa_err.c
rename : openssl/crypto/rsa/rsa_gen.c => main/openssl/crypto/rsa/rsa_gen.c
rename : openssl/crypto/rsa/rsa_lib.c => main/openssl/crypto/rsa/rsa_lib.c
rename : openssl/crypto/rsa/rsa_locl.h => main/openssl/crypto/rsa/rsa_locl.h
rename : openssl/crypto/rsa/rsa_none.c => main/openssl/crypto/rsa/rsa_none.c
rename : openssl/crypto/rsa/rsa_null.c => main/openssl/crypto/rsa/rsa_null.c
rename : openssl/crypto/rsa/rsa_oaep.c => main/openssl/crypto/rsa/rsa_oaep.c
rename : openssl/crypto/rsa/rsa_pk1.c => main/openssl/crypto/rsa/rsa_pk1.c
rename : openssl/crypto/rsa/rsa_pmeth.c => main/openssl/crypto/rsa/rsa_pmeth.c
rename : openssl/crypto/rsa/rsa_prn.c => main/openssl/crypto/rsa/rsa_prn.c
rename : openssl/crypto/rsa/rsa_pss.c => main/openssl/crypto/rsa/rsa_pss.c
rename : openssl/crypto/rsa/rsa_saos.c => main/openssl/crypto/rsa/rsa_saos.c
rename : openssl/crypto/rsa/rsa_sign.c => main/openssl/crypto/rsa/rsa_sign.c
rename : openssl/crypto/rsa/rsa_ssl.c => main/openssl/crypto/rsa/rsa_ssl.c
rename : openssl/crypto/rsa/rsa_test.c => main/openssl/crypto/rsa/rsa_test.c
rename : openssl/crypto/rsa/rsa_x931.c => main/openssl/crypto/rsa/rsa_x931.c
rename : openssl/crypto/s390xcap.c => main/openssl/crypto/s390xcap.c
rename : openssl/crypto/s390xcpuid.S => main/openssl/crypto/s390xcpuid.S
rename : openssl/crypto/sha/asm/README => main/openssl/crypto/sha/asm/README
rename : openssl/crypto/sha/asm/sha1-586.pl => main/openssl/crypto/sha/asm/sha1-586.pl
rename : openssl/crypto/sha/asm/sha1-armv4-large.pl => main/openssl/crypto/sha/asm/sha1-armv4-large.pl
rename : openssl/crypto/sha/asm/sha1-armv4-large.s => main/openssl/crypto/sha/asm/sha1-armv4-large.s
rename : openssl/crypto/sha/asm/sha1-ia64.pl => main/openssl/crypto/sha/asm/sha1-ia64.pl
rename : openssl/crypto/sha/asm/sha1-ppc.pl => main/openssl/crypto/sha/asm/sha1-ppc.pl
rename : openssl/crypto/sha/asm/sha1-s390x.pl => main/openssl/crypto/sha/asm/sha1-s390x.pl
rename : openssl/crypto/sha/asm/sha1-sparcv9.pl => main/openssl/crypto/sha/asm/sha1-sparcv9.pl
rename : openssl/crypto/sha/asm/sha1-sparcv9a.pl => main/openssl/crypto/sha/asm/sha1-sparcv9a.pl
rename : openssl/crypto/sha/asm/sha1-thumb.pl => main/openssl/crypto/sha/asm/sha1-thumb.pl
rename : openssl/crypto/sha/asm/sha1-x86_64.pl => main/openssl/crypto/sha/asm/sha1-x86_64.pl
rename : openssl/crypto/sha/asm/sha256-586.pl => main/openssl/crypto/sha/asm/sha256-586.pl
rename : openssl/crypto/sha/asm/sha256-armv4.pl => main/openssl/crypto/sha/asm/sha256-armv4.pl
rename : openssl/crypto/sha/asm/sha256-armv4.s => main/openssl/crypto/sha/asm/sha256-armv4.s
rename : openssl/crypto/sha/asm/sha512-586.pl => main/openssl/crypto/sha/asm/sha512-586.pl
rename : openssl/crypto/sha/asm/sha512-armv4.pl => main/openssl/crypto/sha/asm/sha512-armv4.pl
rename : openssl/crypto/sha/asm/sha512-armv4.s => main/openssl/crypto/sha/asm/sha512-armv4.s
rename : openssl/crypto/sha/asm/sha512-ia64.pl => main/openssl/crypto/sha/asm/sha512-ia64.pl
rename : openssl/crypto/sha/asm/sha512-ppc.pl => main/openssl/crypto/sha/asm/sha512-ppc.pl
rename : openssl/crypto/sha/asm/sha512-s390x.pl => main/openssl/crypto/sha/asm/sha512-s390x.pl
rename : openssl/crypto/sha/asm/sha512-sparcv9.pl => main/openssl/crypto/sha/asm/sha512-sparcv9.pl
rename : openssl/crypto/sha/asm/sha512-x86_64.pl => main/openssl/crypto/sha/asm/sha512-x86_64.pl
rename : openssl/crypto/sha/sha.c => main/openssl/crypto/sha/sha.c
rename : openssl/crypto/sha/sha.h => main/openssl/crypto/sha/sha.h
rename : openssl/crypto/sha/sha1.c => main/openssl/crypto/sha/sha1.c
rename : openssl/crypto/sha/sha1_one.c => main/openssl/crypto/sha/sha1_one.c
rename : openssl/crypto/sha/sha1dgst.c => main/openssl/crypto/sha/sha1dgst.c
rename : openssl/crypto/sha/sha1test.c => main/openssl/crypto/sha/sha1test.c
rename : openssl/crypto/sha/sha256.c => main/openssl/crypto/sha/sha256.c
rename : openssl/crypto/sha/sha256t.c => main/openssl/crypto/sha/sha256t.c
rename : openssl/crypto/sha/sha512.c => main/openssl/crypto/sha/sha512.c
rename : openssl/crypto/sha/sha512t.c => main/openssl/crypto/sha/sha512t.c
rename : openssl/crypto/sha/sha_dgst.c => main/openssl/crypto/sha/sha_dgst.c
rename : openssl/crypto/sha/sha_locl.h => main/openssl/crypto/sha/sha_locl.h
rename : openssl/crypto/sha/shatest.c => main/openssl/crypto/sha/shatest.c
rename : openssl/crypto/sparccpuid.S => main/openssl/crypto/sparccpuid.S
rename : openssl/crypto/sparcv9cap.c => main/openssl/crypto/sparcv9cap.c
rename : openssl/crypto/stack/safestack.h => main/openssl/crypto/stack/safestack.h
rename : openssl/crypto/stack/stack.c => main/openssl/crypto/stack/stack.c
rename : openssl/crypto/stack/stack.h => main/openssl/crypto/stack/stack.h
rename : openssl/crypto/store/README => main/openssl/crypto/store/README
rename : openssl/crypto/store/store.h => main/openssl/crypto/store/store.h
rename : openssl/crypto/store/str_err.c => main/openssl/crypto/store/str_err.c
rename : openssl/crypto/store/str_lib.c => main/openssl/crypto/store/str_lib.c
rename : openssl/crypto/store/str_locl.h => main/openssl/crypto/store/str_locl.h
rename : openssl/crypto/store/str_mem.c => main/openssl/crypto/store/str_mem.c
rename : openssl/crypto/store/str_meth.c => main/openssl/crypto/store/str_meth.c
rename : openssl/crypto/symhacks.h => main/openssl/crypto/symhacks.h
rename : openssl/crypto/threads/README => main/openssl/crypto/threads/README
rename : openssl/crypto/threads/mttest.c => main/openssl/crypto/threads/mttest.c
rename : openssl/crypto/threads/netware.bat => main/openssl/crypto/threads/netware.bat
rename : openssl/crypto/threads/profile.sh => main/openssl/crypto/threads/profile.sh
rename : openssl/crypto/threads/ptest.bat => main/openssl/crypto/threads/ptest.bat
rename : openssl/crypto/threads/pthread.sh => main/openssl/crypto/threads/pthread.sh
rename : openssl/crypto/threads/pthread2.sh => main/openssl/crypto/threads/pthread2.sh
rename : openssl/crypto/threads/purify.sh => main/openssl/crypto/threads/purify.sh
rename : openssl/crypto/threads/solaris.sh => main/openssl/crypto/threads/solaris.sh
rename : openssl/crypto/threads/th-lock.c => main/openssl/crypto/threads/th-lock.c
rename : openssl/crypto/ts/ts_err.c => main/openssl/crypto/ts/ts_err.c
rename : openssl/crypto/txt_db/txt_db.c => main/openssl/crypto/txt_db/txt_db.c
rename : openssl/crypto/txt_db/txt_db.h => main/openssl/crypto/txt_db/txt_db.h
rename : openssl/crypto/ui/ui.h => main/openssl/crypto/ui/ui.h
rename : openssl/crypto/ui/ui_compat.c => main/openssl/crypto/ui/ui_compat.c
rename : openssl/crypto/ui/ui_compat.h => main/openssl/crypto/ui/ui_compat.h
rename : openssl/crypto/ui/ui_err.c => main/openssl/crypto/ui/ui_err.c
rename : openssl/crypto/ui/ui_lib.c => main/openssl/crypto/ui/ui_lib.c
rename : openssl/crypto/ui/ui_locl.h => main/openssl/crypto/ui/ui_locl.h
rename : openssl/crypto/ui/ui_openssl.c => main/openssl/crypto/ui/ui_openssl.c
rename : openssl/crypto/ui/ui_util.c => main/openssl/crypto/ui/ui_util.c
rename : openssl/crypto/uid.c => main/openssl/crypto/uid.c
rename : openssl/crypto/x509/by_dir.c => main/openssl/crypto/x509/by_dir.c
rename : openssl/crypto/x509/by_file.c => main/openssl/crypto/x509/by_file.c
rename : openssl/crypto/x509/x509.h => main/openssl/crypto/x509/x509.h
rename : openssl/crypto/x509/x509_att.c => main/openssl/crypto/x509/x509_att.c
rename : openssl/crypto/x509/x509_cmp.c => main/openssl/crypto/x509/x509_cmp.c
rename : openssl/crypto/x509/x509_d2.c => main/openssl/crypto/x509/x509_d2.c
rename : openssl/crypto/x509/x509_def.c => main/openssl/crypto/x509/x509_def.c
rename : openssl/crypto/x509/x509_err.c => main/openssl/crypto/x509/x509_err.c
rename : openssl/crypto/x509/x509_ext.c => main/openssl/crypto/x509/x509_ext.c
rename : openssl/crypto/x509/x509_lu.c => main/openssl/crypto/x509/x509_lu.c
rename : openssl/crypto/x509/x509_obj.c => main/openssl/crypto/x509/x509_obj.c
rename : openssl/crypto/x509/x509_r2x.c => main/openssl/crypto/x509/x509_r2x.c
rename : openssl/crypto/x509/x509_req.c => main/openssl/crypto/x509/x509_req.c
rename : openssl/crypto/x509/x509_set.c => main/openssl/crypto/x509/x509_set.c
rename : openssl/crypto/x509/x509_trs.c => main/openssl/crypto/x509/x509_trs.c
rename : openssl/crypto/x509/x509_txt.c => main/openssl/crypto/x509/x509_txt.c
rename : openssl/crypto/x509/x509_v3.c => main/openssl/crypto/x509/x509_v3.c
rename : openssl/crypto/x509/x509_vfy.c => main/openssl/crypto/x509/x509_vfy.c
rename : openssl/crypto/x509/x509_vfy.h => main/openssl/crypto/x509/x509_vfy.h
rename : openssl/crypto/x509/x509_vpm.c => main/openssl/crypto/x509/x509_vpm.c
rename : openssl/crypto/x509/x509cset.c => main/openssl/crypto/x509/x509cset.c
rename : openssl/crypto/x509/x509name.c => main/openssl/crypto/x509/x509name.c
rename : openssl/crypto/x509/x509rset.c => main/openssl/crypto/x509/x509rset.c
rename : openssl/crypto/x509/x509spki.c => main/openssl/crypto/x509/x509spki.c
rename : openssl/crypto/x509/x509type.c => main/openssl/crypto/x509/x509type.c
rename : openssl/crypto/x509/x_all.c => main/openssl/crypto/x509/x_all.c
rename : openssl/crypto/x509v3/ext_dat.h => main/openssl/crypto/x509v3/ext_dat.h
rename : openssl/crypto/x509v3/pcy_cache.c => main/openssl/crypto/x509v3/pcy_cache.c
rename : openssl/crypto/x509v3/pcy_data.c => main/openssl/crypto/x509v3/pcy_data.c
rename : openssl/crypto/x509v3/pcy_int.h => main/openssl/crypto/x509v3/pcy_int.h
rename : openssl/crypto/x509v3/pcy_lib.c => main/openssl/crypto/x509v3/pcy_lib.c
rename : openssl/crypto/x509v3/pcy_map.c => main/openssl/crypto/x509v3/pcy_map.c
rename : openssl/crypto/x509v3/pcy_node.c => main/openssl/crypto/x509v3/pcy_node.c
rename : openssl/crypto/x509v3/pcy_tree.c => main/openssl/crypto/x509v3/pcy_tree.c
rename : openssl/crypto/x509v3/tabtest.c => main/openssl/crypto/x509v3/tabtest.c
rename : openssl/crypto/x509v3/v3_addr.c => main/openssl/crypto/x509v3/v3_addr.c
rename : openssl/crypto/x509v3/v3_akey.c => main/openssl/crypto/x509v3/v3_akey.c
rename : openssl/crypto/x509v3/v3_akeya.c => main/openssl/crypto/x509v3/v3_akeya.c
rename : openssl/crypto/x509v3/v3_alt.c => main/openssl/crypto/x509v3/v3_alt.c
rename : openssl/crypto/x509v3/v3_asid.c => main/openssl/crypto/x509v3/v3_asid.c
rename : openssl/crypto/x509v3/v3_bcons.c => main/openssl/crypto/x509v3/v3_bcons.c
rename : openssl/crypto/x509v3/v3_bitst.c => main/openssl/crypto/x509v3/v3_bitst.c
rename : openssl/crypto/x509v3/v3_conf.c => main/openssl/crypto/x509v3/v3_conf.c
rename : openssl/crypto/x509v3/v3_cpols.c => main/openssl/crypto/x509v3/v3_cpols.c
rename : openssl/crypto/x509v3/v3_crld.c => main/openssl/crypto/x509v3/v3_crld.c
rename : openssl/crypto/x509v3/v3_enum.c => main/openssl/crypto/x509v3/v3_enum.c
rename : openssl/crypto/x509v3/v3_extku.c => main/openssl/crypto/x509v3/v3_extku.c
rename : openssl/crypto/x509v3/v3_genn.c => main/openssl/crypto/x509v3/v3_genn.c
rename : openssl/crypto/x509v3/v3_ia5.c => main/openssl/crypto/x509v3/v3_ia5.c
rename : openssl/crypto/x509v3/v3_info.c => main/openssl/crypto/x509v3/v3_info.c
rename : openssl/crypto/x509v3/v3_int.c => main/openssl/crypto/x509v3/v3_int.c
rename : openssl/crypto/x509v3/v3_lib.c => main/openssl/crypto/x509v3/v3_lib.c
rename : openssl/crypto/x509v3/v3_ncons.c => main/openssl/crypto/x509v3/v3_ncons.c
rename : openssl/crypto/x509v3/v3_ocsp.c => main/openssl/crypto/x509v3/v3_ocsp.c
rename : openssl/crypto/x509v3/v3_pci.c => main/openssl/crypto/x509v3/v3_pci.c
rename : openssl/crypto/x509v3/v3_pcia.c => main/openssl/crypto/x509v3/v3_pcia.c
rename : openssl/crypto/x509v3/v3_pcons.c => main/openssl/crypto/x509v3/v3_pcons.c
rename : openssl/crypto/x509v3/v3_pku.c => main/openssl/crypto/x509v3/v3_pku.c
rename : openssl/crypto/x509v3/v3_pmaps.c => main/openssl/crypto/x509v3/v3_pmaps.c
rename : openssl/crypto/x509v3/v3_prn.c => main/openssl/crypto/x509v3/v3_prn.c
rename : openssl/crypto/x509v3/v3_purp.c => main/openssl/crypto/x509v3/v3_purp.c
rename : openssl/crypto/x509v3/v3_skey.c => main/openssl/crypto/x509v3/v3_skey.c
rename : openssl/crypto/x509v3/v3_sxnet.c => main/openssl/crypto/x509v3/v3_sxnet.c
rename : openssl/crypto/x509v3/v3_utl.c => main/openssl/crypto/x509v3/v3_utl.c
rename : openssl/crypto/x509v3/v3conf.c => main/openssl/crypto/x509v3/v3conf.c
rename : openssl/crypto/x509v3/v3err.c => main/openssl/crypto/x509v3/v3err.c
rename : openssl/crypto/x509v3/v3prin.c => main/openssl/crypto/x509v3/v3prin.c
rename : openssl/crypto/x509v3/x509v3.h => main/openssl/crypto/x509v3/x509v3.h
rename : openssl/crypto/x86_64cpuid.pl => main/openssl/crypto/x86_64cpuid.pl
rename : openssl/crypto/x86cpuid.pl => main/openssl/crypto/x86cpuid.pl
rename : openssl/e_os.h => main/openssl/e_os.h
rename : openssl/e_os2.h => main/openssl/e_os2.h
rename : openssl/import_openssl.sh => main/openssl/import_openssl.sh
rename : openssl/include/openssl/aes.h => main/openssl/include/openssl/aes.h
rename : openssl/include/openssl/asn1.h => main/openssl/include/openssl/asn1.h
rename : openssl/include/openssl/asn1_mac.h => main/openssl/include/openssl/asn1_mac.h
rename : openssl/include/openssl/asn1t.h => main/openssl/include/openssl/asn1t.h
rename : openssl/include/openssl/bio.h => main/openssl/include/openssl/bio.h
rename : openssl/include/openssl/blowfish.h => main/openssl/include/openssl/blowfish.h
rename : openssl/include/openssl/bn.h => main/openssl/include/openssl/bn.h
rename : openssl/include/openssl/buffer.h => main/openssl/include/openssl/buffer.h
rename : openssl/include/openssl/comp.h => main/openssl/include/openssl/comp.h
rename : openssl/include/openssl/conf.h => main/openssl/include/openssl/conf.h
rename : openssl/include/openssl/conf_api.h => main/openssl/include/openssl/conf_api.h
rename : openssl/include/openssl/crypto.h => main/openssl/include/openssl/crypto.h
rename : openssl/include/openssl/des.h => main/openssl/include/openssl/des.h
rename : openssl/include/openssl/des_old.h => main/openssl/include/openssl/des_old.h
rename : openssl/include/openssl/dh.h => main/openssl/include/openssl/dh.h
rename : openssl/include/openssl/dsa.h => main/openssl/include/openssl/dsa.h
rename : openssl/include/openssl/dso.h => main/openssl/include/openssl/dso.h
rename : openssl/include/openssl/dtls1.h => main/openssl/include/openssl/dtls1.h
rename : openssl/include/openssl/e_os2.h => main/openssl/include/openssl/e_os2.h
rename : openssl/include/openssl/ebcdic.h => main/openssl/include/openssl/ebcdic.h
rename : openssl/include/openssl/ec.h => main/openssl/include/openssl/ec.h
rename : openssl/include/openssl/ecdh.h => main/openssl/include/openssl/ecdh.h
rename : openssl/include/openssl/ecdsa.h => main/openssl/include/openssl/ecdsa.h
rename : openssl/include/openssl/engine.h => main/openssl/include/openssl/engine.h
rename : openssl/include/openssl/err.h => main/openssl/include/openssl/err.h
rename : openssl/include/openssl/evp.h => main/openssl/include/openssl/evp.h
rename : openssl/include/openssl/hmac.h => main/openssl/include/openssl/hmac.h
rename : openssl/include/openssl/krb5_asn.h => main/openssl/include/openssl/krb5_asn.h
rename : openssl/include/openssl/kssl.h => main/openssl/include/openssl/kssl.h
rename : openssl/include/openssl/lhash.h => main/openssl/include/openssl/lhash.h
rename : openssl/include/openssl/md4.h => main/openssl/include/openssl/md4.h
rename : openssl/include/openssl/md5.h => main/openssl/include/openssl/md5.h
rename : openssl/include/openssl/modes.h => main/openssl/include/openssl/modes.h
rename : openssl/include/openssl/obj_mac.h => main/openssl/include/openssl/obj_mac.h
rename : openssl/include/openssl/objects.h => main/openssl/include/openssl/objects.h
rename : openssl/include/openssl/ocsp.h => main/openssl/include/openssl/ocsp.h
rename : openssl/include/openssl/opensslconf.h => main/openssl/include/openssl/opensslconf.h
rename : openssl/include/openssl/opensslv.h => main/openssl/include/openssl/opensslv.h
rename : openssl/include/openssl/ossl_typ.h => main/openssl/include/openssl/ossl_typ.h
rename : openssl/include/openssl/pem.h => main/openssl/include/openssl/pem.h
rename : openssl/include/openssl/pem2.h => main/openssl/include/openssl/pem2.h
rename : openssl/include/openssl/pkcs12.h => main/openssl/include/openssl/pkcs12.h
rename : openssl/include/openssl/pkcs7.h => main/openssl/include/openssl/pkcs7.h
rename : openssl/include/openssl/pqueue.h => main/openssl/include/openssl/pqueue.h
rename : openssl/include/openssl/rand.h => main/openssl/include/openssl/rand.h
rename : openssl/include/openssl/rc2.h => main/openssl/include/openssl/rc2.h
rename : openssl/include/openssl/rc4.h => main/openssl/include/openssl/rc4.h
rename : openssl/include/openssl/ripemd.h => main/openssl/include/openssl/ripemd.h
rename : openssl/include/openssl/rsa.h => main/openssl/include/openssl/rsa.h
rename : openssl/include/openssl/safestack.h => main/openssl/include/openssl/safestack.h
rename : openssl/include/openssl/sha.h => main/openssl/include/openssl/sha.h
rename : openssl/include/openssl/ssl.h => main/openssl/include/openssl/ssl.h
rename : openssl/include/openssl/ssl2.h => main/openssl/include/openssl/ssl2.h
rename : openssl/include/openssl/ssl23.h => main/openssl/include/openssl/ssl23.h
rename : openssl/include/openssl/ssl3.h => main/openssl/include/openssl/ssl3.h
rename : openssl/include/openssl/stack.h => main/openssl/include/openssl/stack.h
rename : openssl/include/openssl/symhacks.h => main/openssl/include/openssl/symhacks.h
rename : openssl/include/openssl/tls1.h => main/openssl/include/openssl/tls1.h
rename : openssl/include/openssl/ts.h => main/openssl/include/openssl/ts.h
rename : openssl/include/openssl/txt_db.h => main/openssl/include/openssl/txt_db.h
rename : openssl/include/openssl/ui.h => main/openssl/include/openssl/ui.h
rename : openssl/include/openssl/ui_compat.h => main/openssl/include/openssl/ui_compat.h
rename : openssl/include/openssl/x509.h => main/openssl/include/openssl/x509.h
rename : openssl/include/openssl/x509_vfy.h => main/openssl/include/openssl/x509_vfy.h
rename : openssl/include/openssl/x509v3.h => main/openssl/include/openssl/x509v3.h
rename : openssl/openssl.config => main/openssl/openssl.config
rename : openssl/openssl.version => main/openssl/openssl.version
rename : openssl/patches/README => main/openssl/patches/README
rename : openssl/patches/apps_Android.mk => main/openssl/patches/apps_Android.mk
rename : openssl/patches/crypto_Android.mk => main/openssl/patches/crypto_Android.mk
rename : openssl/patches/handshake_cutthrough.patch => main/openssl/patches/handshake_cutthrough.patch
rename : openssl/patches/jsse.patch => main/openssl/patches/jsse.patch
rename : openssl/patches/npn.patch => main/openssl/patches/npn.patch
rename : openssl/patches/progs.patch => main/openssl/patches/progs.patch
rename : openssl/patches/sha1_armv4_large.patch => main/openssl/patches/sha1_armv4_large.patch
rename : openssl/patches/small_records.patch => main/openssl/patches/small_records.patch
rename : openssl/patches/ssl_Android.mk => main/openssl/patches/ssl_Android.mk
rename : openssl/patches/sslv3_uninit_padding.patch => main/openssl/patches/sslv3_uninit_padding.patch
rename : openssl/patches/testssl.sh => main/openssl/patches/testssl.sh
rename : openssl/ssl/Android.mk => main/openssl/ssl/Android.mk
rename : openssl/ssl/Makefile => main/openssl/ssl/Makefile
rename : openssl/ssl/bio_ssl.c => main/openssl/ssl/bio_ssl.c
rename : openssl/ssl/d1_both.c => main/openssl/ssl/d1_both.c
rename : openssl/ssl/d1_clnt.c => main/openssl/ssl/d1_clnt.c
rename : openssl/ssl/d1_enc.c => main/openssl/ssl/d1_enc.c
rename : openssl/ssl/d1_lib.c => main/openssl/ssl/d1_lib.c
rename : openssl/ssl/d1_meth.c => main/openssl/ssl/d1_meth.c
rename : openssl/ssl/d1_pkt.c => main/openssl/ssl/d1_pkt.c
rename : openssl/ssl/d1_srvr.c => main/openssl/ssl/d1_srvr.c
rename : openssl/ssl/dtls1.h => main/openssl/ssl/dtls1.h
rename : openssl/ssl/kssl.c => main/openssl/ssl/kssl.c
rename : openssl/ssl/kssl.h => main/openssl/ssl/kssl.h
rename : openssl/ssl/kssl_lcl.h => main/openssl/ssl/kssl_lcl.h
rename : openssl/ssl/s23_clnt.c => main/openssl/ssl/s23_clnt.c
rename : openssl/ssl/s23_lib.c => main/openssl/ssl/s23_lib.c
rename : openssl/ssl/s23_meth.c => main/openssl/ssl/s23_meth.c
rename : openssl/ssl/s23_pkt.c => main/openssl/ssl/s23_pkt.c
rename : openssl/ssl/s23_srvr.c => main/openssl/ssl/s23_srvr.c
rename : openssl/ssl/s2_clnt.c => main/openssl/ssl/s2_clnt.c
rename : openssl/ssl/s2_enc.c => main/openssl/ssl/s2_enc.c
rename : openssl/ssl/s2_lib.c => main/openssl/ssl/s2_lib.c
rename : openssl/ssl/s2_meth.c => main/openssl/ssl/s2_meth.c
rename : openssl/ssl/s2_pkt.c => main/openssl/ssl/s2_pkt.c
rename : openssl/ssl/s2_srvr.c => main/openssl/ssl/s2_srvr.c
rename : openssl/ssl/s3_both.c => main/openssl/ssl/s3_both.c
rename : openssl/ssl/s3_clnt.c => main/openssl/ssl/s3_clnt.c
rename : openssl/ssl/s3_enc.c => main/openssl/ssl/s3_enc.c
rename : openssl/ssl/s3_lib.c => main/openssl/ssl/s3_lib.c
rename : openssl/ssl/s3_meth.c => main/openssl/ssl/s3_meth.c
rename : openssl/ssl/s3_pkt.c => main/openssl/ssl/s3_pkt.c
rename : openssl/ssl/s3_srvr.c => main/openssl/ssl/s3_srvr.c
rename : openssl/ssl/ssl.h => main/openssl/ssl/ssl.h
rename : openssl/ssl/ssl2.h => main/openssl/ssl/ssl2.h
rename : openssl/ssl/ssl23.h => main/openssl/ssl/ssl23.h
rename : openssl/ssl/ssl3.h => main/openssl/ssl/ssl3.h
rename : openssl/ssl/ssl_algs.c => main/openssl/ssl/ssl_algs.c
rename : openssl/ssl/ssl_asn1.c => main/openssl/ssl/ssl_asn1.c
rename : openssl/ssl/ssl_cert.c => main/openssl/ssl/ssl_cert.c
rename : openssl/ssl/ssl_ciph.c => main/openssl/ssl/ssl_ciph.c
rename : openssl/ssl/ssl_err.c => main/openssl/ssl/ssl_err.c
rename : openssl/ssl/ssl_err2.c => main/openssl/ssl/ssl_err2.c
rename : openssl/ssl/ssl_lib.c => main/openssl/ssl/ssl_lib.c
rename : openssl/ssl/ssl_locl.h => main/openssl/ssl/ssl_locl.h
rename : openssl/ssl/ssl_rsa.c => main/openssl/ssl/ssl_rsa.c
rename : openssl/ssl/ssl_sess.c => main/openssl/ssl/ssl_sess.c
rename : openssl/ssl/ssl_stat.c => main/openssl/ssl/ssl_stat.c
rename : openssl/ssl/ssl_txt.c => main/openssl/ssl/ssl_txt.c
rename : openssl/ssl/ssltest.c => main/openssl/ssl/ssltest.c
rename : openssl/ssl/t1_clnt.c => main/openssl/ssl/t1_clnt.c
rename : openssl/ssl/t1_enc.c => main/openssl/ssl/t1_enc.c
rename : openssl/ssl/t1_lib.c => main/openssl/ssl/t1_lib.c
rename : openssl/ssl/t1_meth.c => main/openssl/ssl/t1_meth.c
rename : openssl/ssl/t1_reneg.c => main/openssl/ssl/t1_reneg.c
rename : openssl/ssl/t1_srvr.c => main/openssl/ssl/t1_srvr.c
rename : openssl/ssl/tls1.h => main/openssl/ssl/tls1.h
rename : openvpn/.gitignore => main/openvpn/.gitignore
rename : openvpn/.mailmap => main/openvpn/.mailmap
rename : openvpn/.svncommitters => main/openvpn/.svncommitters
rename : openvpn/AUTHORS => main/openvpn/AUTHORS
rename : openvpn/Android.mk => main/openvpn/Android.mk
rename : openvpn/COPYING => main/openvpn/COPYING
rename : openvpn/COPYRIGHT.GPL => main/openvpn/COPYRIGHT.GPL
rename : openvpn/ChangeLog => main/openvpn/ChangeLog
rename : openvpn/INSTALL => main/openvpn/INSTALL
rename : openvpn/INSTALL-win32.txt => main/openvpn/INSTALL-win32.txt
rename : openvpn/Makefile.am => main/openvpn/Makefile.am
rename : openvpn/NEWS => main/openvpn/NEWS
rename : openvpn/PORTS => main/openvpn/PORTS
rename : openvpn/README => main/openvpn/README
rename : openvpn/README.IPv6 => main/openvpn/README.IPv6
rename : openvpn/README.polarssl => main/openvpn/README.polarssl
rename : openvpn/TODO.IPv6 => main/openvpn/TODO.IPv6
rename : openvpn/build/Makefile.am => main/openvpn/build/Makefile.am
rename : openvpn/build/ltrc.inc => main/openvpn/build/ltrc.inc
rename : openvpn/build/msvc/Makefile.am => main/openvpn/build/msvc/Makefile.am
rename : openvpn/build/msvc/msvc-generate/Makefile.am => main/openvpn/build/msvc/msvc-generate/Makefile.am
rename : openvpn/build/msvc/msvc-generate/Makefile.mak => main/openvpn/build/msvc/msvc-generate/Makefile.mak
rename : openvpn/build/msvc/msvc-generate/msvc-generate.js => main/openvpn/build/msvc/msvc-generate/msvc-generate.js
rename : openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj => main/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj
rename : openvpn/compat.m4 => main/openvpn/compat.m4
rename : openvpn/config-msvc-version.h.in => main/openvpn/config-msvc-version.h.in
rename : openvpn/config-msvc.h => main/openvpn/config-msvc.h
rename : openvpn/config-version.h => main/openvpn/config-version.h
rename : openvpn/config.h => main/openvpn/config.h
rename : openvpn/configure.ac => main/openvpn/configure.ac
rename : openvpn/contrib/OCSP_check/OCSP_check.sh => main/openvpn/contrib/OCSP_check/OCSP_check.sh
rename : openvpn/contrib/README => main/openvpn/contrib/README
rename : openvpn/contrib/multilevel-init.patch => main/openvpn/contrib/multilevel-init.patch
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/README => main/openvpn/contrib/openvpn-fwmarkroute-1.00/README
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down => main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up => main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up
rename : openvpn/contrib/pull-resolv-conf/client.down => main/openvpn/contrib/pull-resolv-conf/client.down
rename : openvpn/contrib/pull-resolv-conf/client.up => main/openvpn/contrib/pull-resolv-conf/client.up
rename : openvpn/debug/doval => main/openvpn/debug/doval
rename : openvpn/debug/dovalns => main/openvpn/debug/dovalns
rename : openvpn/debug/valgrind-suppress => main/openvpn/debug/valgrind-suppress
rename : openvpn/distro/Makefile.am => main/openvpn/distro/Makefile.am
rename : openvpn/distro/rpm/Makefile.am => main/openvpn/distro/rpm/Makefile.am
rename : openvpn/distro/rpm/openvpn.init.d.rhel => main/openvpn/distro/rpm/openvpn.init.d.rhel
rename : openvpn/distro/rpm/openvpn.init.d.suse => main/openvpn/distro/rpm/openvpn.init.d.suse
rename : openvpn/distro/rpm/openvpn.spec => main/openvpn/distro/rpm/openvpn.spec
rename : openvpn/distro/rpm/openvpn.spec.in => main/openvpn/distro/rpm/openvpn.spec.in
rename : openvpn/doc/Makefile.am => main/openvpn/doc/Makefile.am
rename : openvpn/doc/README.plugins => main/openvpn/doc/README.plugins
rename : openvpn/doc/android.txt => main/openvpn/doc/android.txt
rename : openvpn/doc/doxygen/doc_compression.h => main/openvpn/doc/doxygen/doc_compression.h
rename : openvpn/doc/doxygen/doc_control_processor.h => main/openvpn/doc/doxygen/doc_control_processor.h
rename : openvpn/doc/doxygen/doc_control_tls.h => main/openvpn/doc/doxygen/doc_control_tls.h
rename : openvpn/doc/doxygen/doc_data_control.h => main/openvpn/doc/doxygen/doc_data_control.h
rename : openvpn/doc/doxygen/doc_data_crypto.h => main/openvpn/doc/doxygen/doc_data_crypto.h
rename : openvpn/doc/doxygen/doc_eventloop.h => main/openvpn/doc/doxygen/doc_eventloop.h
rename : openvpn/doc/doxygen/doc_external_multiplexer.h => main/openvpn/doc/doxygen/doc_external_multiplexer.h
rename : openvpn/doc/doxygen/doc_fragmentation.h => main/openvpn/doc/doxygen/doc_fragmentation.h
rename : openvpn/doc/doxygen/doc_internal_multiplexer.h => main/openvpn/doc/doxygen/doc_internal_multiplexer.h
rename : openvpn/doc/doxygen/doc_key_generation.h => main/openvpn/doc/doxygen/doc_key_generation.h
rename : openvpn/doc/doxygen/doc_mainpage.h => main/openvpn/doc/doxygen/doc_mainpage.h
rename : openvpn/doc/doxygen/doc_memory_management.h => main/openvpn/doc/doxygen/doc_memory_management.h
rename : openvpn/doc/doxygen/doc_protocol_overview.h => main/openvpn/doc/doxygen/doc_protocol_overview.h
rename : openvpn/doc/doxygen/doc_reliable.h => main/openvpn/doc/doxygen/doc_reliable.h
rename : openvpn/doc/doxygen/doc_tunnel_state.h => main/openvpn/doc/doxygen/doc_tunnel_state.h
rename : openvpn/doc/doxygen/openvpn.doxyfile => main/openvpn/doc/doxygen/openvpn.doxyfile
rename : openvpn/doc/management-notes.txt => main/openvpn/doc/management-notes.txt
rename : openvpn/doc/openvpn.8 => main/openvpn/doc/openvpn.8
rename : openvpn/include/Makefile.am => main/openvpn/include/Makefile.am
rename : openvpn/include/openvpn-plugin.h => main/openvpn/include/openvpn-plugin.h
rename : openvpn/m4/.keep => main/openvpn/m4/.keep
rename : openvpn/m4/ax_emptyarray.m4 => main/openvpn/m4/ax_emptyarray.m4
rename : openvpn/m4/ax_socklen_t.m4 => main/openvpn/m4/ax_socklen_t.m4
rename : openvpn/m4/ax_varargs.m4 => main/openvpn/m4/ax_varargs.m4
rename : openvpn/m4/pkg.m4 => main/openvpn/m4/pkg.m4
rename : openvpn/msvc-build.bat => main/openvpn/msvc-build.bat
rename : openvpn/msvc-dev.bat => main/openvpn/msvc-dev.bat
rename : openvpn/msvc-env.bat => main/openvpn/msvc-env.bat
rename : openvpn/openvpn.sln => main/openvpn/openvpn.sln
rename : openvpn/sample/Makefile.am => main/openvpn/sample/Makefile.am
rename : openvpn/sample/sample-config-files/README => main/openvpn/sample/sample-config-files/README
rename : openvpn/sample/sample-config-files/client.conf => main/openvpn/sample/sample-config-files/client.conf
rename : openvpn/sample/sample-config-files/firewall.sh => main/openvpn/sample/sample-config-files/firewall.sh
rename : openvpn/sample/sample-config-files/home.up => main/openvpn/sample/sample-config-files/home.up
rename : openvpn/sample/sample-config-files/loopback-client => main/openvpn/sample/sample-config-files/loopback-client
rename : openvpn/sample/sample-config-files/loopback-server => main/openvpn/sample/sample-config-files/loopback-server
rename : openvpn/sample/sample-config-files/office.up => main/openvpn/sample/sample-config-files/office.up
rename : openvpn/sample/sample-config-files/openvpn-shutdown.sh => main/openvpn/sample/sample-config-files/openvpn-shutdown.sh
rename : openvpn/sample/sample-config-files/openvpn-startup.sh => main/openvpn/sample/sample-config-files/openvpn-startup.sh
rename : openvpn/sample/sample-config-files/server.conf => main/openvpn/sample/sample-config-files/server.conf
rename : openvpn/sample/sample-config-files/static-home.conf => main/openvpn/sample/sample-config-files/static-home.conf
rename : openvpn/sample/sample-config-files/static-office.conf => main/openvpn/sample/sample-config-files/static-office.conf
rename : openvpn/sample/sample-config-files/tls-home.conf => main/openvpn/sample/sample-config-files/tls-home.conf
rename : openvpn/sample/sample-config-files/tls-office.conf => main/openvpn/sample/sample-config-files/tls-office.conf
rename : openvpn/sample/sample-config-files/xinetd-client-config => main/openvpn/sample/sample-config-files/xinetd-client-config
rename : openvpn/sample/sample-config-files/xinetd-server-config => main/openvpn/sample/sample-config-files/xinetd-server-config
rename : openvpn/sample/sample-keys/README => main/openvpn/sample/sample-keys/README
rename : openvpn/sample/sample-keys/ca.crt => main/openvpn/sample/sample-keys/ca.crt
rename : openvpn/sample/sample-keys/ca.key => main/openvpn/sample/sample-keys/ca.key
rename : openvpn/sample/sample-keys/client.crt => main/openvpn/sample/sample-keys/client.crt
rename : openvpn/sample/sample-keys/client.key => main/openvpn/sample/sample-keys/client.key
rename : openvpn/sample/sample-keys/dh1024.pem => main/openvpn/sample/sample-keys/dh1024.pem
rename : openvpn/sample/sample-keys/pass.crt => main/openvpn/sample/sample-keys/pass.crt
rename : openvpn/sample/sample-keys/pass.key => main/openvpn/sample/sample-keys/pass.key
rename : openvpn/sample/sample-keys/pkcs12.p12 => main/openvpn/sample/sample-keys/pkcs12.p12
rename : openvpn/sample/sample-keys/server.crt => main/openvpn/sample/sample-keys/server.crt
rename : openvpn/sample/sample-keys/server.key => main/openvpn/sample/sample-keys/server.key
rename : openvpn/sample/sample-plugins/defer/README => main/openvpn/sample/sample-plugins/defer/README
rename : openvpn/sample/sample-plugins/defer/build => main/openvpn/sample/sample-plugins/defer/build
rename : openvpn/sample/sample-plugins/defer/simple.c => main/openvpn/sample/sample-plugins/defer/simple.c
rename : openvpn/sample/sample-plugins/defer/simple.def => main/openvpn/sample/sample-plugins/defer/simple.def
rename : openvpn/sample/sample-plugins/defer/winbuild => main/openvpn/sample/sample-plugins/defer/winbuild
rename : openvpn/sample/sample-plugins/log/build => main/openvpn/sample/sample-plugins/log/build
rename : openvpn/sample/sample-plugins/log/log.c => main/openvpn/sample/sample-plugins/log/log.c
rename : openvpn/sample/sample-plugins/log/log_v3.c => main/openvpn/sample/sample-plugins/log/log_v3.c
rename : openvpn/sample/sample-plugins/log/winbuild => main/openvpn/sample/sample-plugins/log/winbuild
rename : openvpn/sample/sample-plugins/simple/README => main/openvpn/sample/sample-plugins/simple/README
rename : openvpn/sample/sample-plugins/simple/build => main/openvpn/sample/sample-plugins/simple/build
rename : openvpn/sample/sample-plugins/simple/simple.c => main/openvpn/sample/sample-plugins/simple/simple.c
rename : openvpn/sample/sample-plugins/simple/simple.def => main/openvpn/sample/sample-plugins/simple/simple.def
rename : openvpn/sample/sample-plugins/simple/winbuild => main/openvpn/sample/sample-plugins/simple/winbuild
rename : openvpn/sample/sample-scripts/auth-pam.pl => main/openvpn/sample/sample-scripts/auth-pam.pl
rename : openvpn/sample/sample-scripts/bridge-start => main/openvpn/sample/sample-scripts/bridge-start
rename : openvpn/sample/sample-scripts/bridge-stop => main/openvpn/sample/sample-scripts/bridge-stop
rename : openvpn/sample/sample-scripts/ucn.pl => main/openvpn/sample/sample-scripts/ucn.pl
rename : openvpn/sample/sample-scripts/verify-cn => main/openvpn/sample/sample-scripts/verify-cn
rename : openvpn/sample/sample-windows/sample.ovpn => main/openvpn/sample/sample-windows/sample.ovpn
rename : openvpn/src/Makefile.am => main/openvpn/src/Makefile.am
rename : openvpn/src/compat/Makefile.am => main/openvpn/src/compat/Makefile.am
rename : openvpn/src/compat/compat-basename.c => main/openvpn/src/compat/compat-basename.c
rename : openvpn/src/compat/compat-daemon.c => main/openvpn/src/compat/compat-daemon.c
rename : openvpn/src/compat/compat-dirname.c => main/openvpn/src/compat/compat-dirname.c
rename : openvpn/src/compat/compat-gettimeofday.c => main/openvpn/src/compat/compat-gettimeofday.c
rename : openvpn/src/compat/compat-inet_ntop.c => main/openvpn/src/compat/compat-inet_ntop.c
rename : openvpn/src/compat/compat-inet_pton.c => main/openvpn/src/compat/compat-inet_pton.c
rename : openvpn/src/compat/compat-lz4.c => main/openvpn/src/compat/compat-lz4.c
rename : openvpn/src/compat/compat-lz4.h => main/openvpn/src/compat/compat-lz4.h
rename : openvpn/src/compat/compat-stdbool.h => main/openvpn/src/compat/compat-stdbool.h
rename : openvpn/src/compat/compat.h => main/openvpn/src/compat/compat.h
rename : openvpn/src/compat/compat.vcxproj => main/openvpn/src/compat/compat.vcxproj
rename : openvpn/src/compat/compat.vcxproj.filters => main/openvpn/src/compat/compat.vcxproj.filters
rename : openvpn/src/openvpn/Makefile.am => main/openvpn/src/openvpn/Makefile.am
rename : openvpn/src/openvpn/base64.c => main/openvpn/src/openvpn/base64.c
rename : openvpn/src/openvpn/base64.h => main/openvpn/src/openvpn/base64.h
rename : openvpn/src/openvpn/basic.h => main/openvpn/src/openvpn/basic.h
rename : openvpn/src/openvpn/breakpad.cpp => main/openvpn/src/openvpn/breakpad.cpp
rename : openvpn/src/openvpn/breakpad.h => main/openvpn/src/openvpn/breakpad.h
rename : openvpn/src/openvpn/buffer.c => main/openvpn/src/openvpn/buffer.c
rename : openvpn/src/openvpn/buffer.h => main/openvpn/src/openvpn/buffer.h
rename : openvpn/src/openvpn/circ_list.h => main/openvpn/src/openvpn/circ_list.h
rename : openvpn/src/openvpn/clinat.c => main/openvpn/src/openvpn/clinat.c
rename : openvpn/src/openvpn/clinat.h => main/openvpn/src/openvpn/clinat.h
rename : openvpn/src/openvpn/common.h => main/openvpn/src/openvpn/common.h
rename : openvpn/src/openvpn/comp-lz4.c => main/openvpn/src/openvpn/comp-lz4.c
rename : openvpn/src/openvpn/comp-lz4.h => main/openvpn/src/openvpn/comp-lz4.h
rename : openvpn/src/openvpn/comp.c => main/openvpn/src/openvpn/comp.c
rename : openvpn/src/openvpn/comp.h => main/openvpn/src/openvpn/comp.h
rename : openvpn/src/openvpn/compstub.c => main/openvpn/src/openvpn/compstub.c
rename : openvpn/src/openvpn/console.c => main/openvpn/src/openvpn/console.c
rename : openvpn/src/openvpn/console.h => main/openvpn/src/openvpn/console.h
rename : openvpn/src/openvpn/crypto.c => main/openvpn/src/openvpn/crypto.c
rename : openvpn/src/openvpn/crypto.h => main/openvpn/src/openvpn/crypto.h
rename : openvpn/src/openvpn/crypto_backend.h => main/openvpn/src/openvpn/crypto_backend.h
rename : openvpn/src/openvpn/crypto_openssl.c => main/openvpn/src/openvpn/crypto_openssl.c
rename : openvpn/src/openvpn/crypto_openssl.h => main/openvpn/src/openvpn/crypto_openssl.h
rename : openvpn/src/openvpn/crypto_polarssl.c => main/openvpn/src/openvpn/crypto_polarssl.c
rename : openvpn/src/openvpn/crypto_polarssl.h => main/openvpn/src/openvpn/crypto_polarssl.h
rename : openvpn/src/openvpn/cryptoapi.c => main/openvpn/src/openvpn/cryptoapi.c
rename : openvpn/src/openvpn/cryptoapi.h => main/openvpn/src/openvpn/cryptoapi.h
rename : openvpn/src/openvpn/dhcp.c => main/openvpn/src/openvpn/dhcp.c
rename : openvpn/src/openvpn/dhcp.h => main/openvpn/src/openvpn/dhcp.h
rename : openvpn/src/openvpn/errlevel.h => main/openvpn/src/openvpn/errlevel.h
rename : openvpn/src/openvpn/error.c => main/openvpn/src/openvpn/error.c
rename : openvpn/src/openvpn/error.h => main/openvpn/src/openvpn/error.h
rename : openvpn/src/openvpn/event.c => main/openvpn/src/openvpn/event.c
rename : openvpn/src/openvpn/event.h => main/openvpn/src/openvpn/event.h
rename : openvpn/src/openvpn/fdmisc.c => main/openvpn/src/openvpn/fdmisc.c
rename : openvpn/src/openvpn/fdmisc.h => main/openvpn/src/openvpn/fdmisc.h
rename : openvpn/src/openvpn/forward-inline.h => main/openvpn/src/openvpn/forward-inline.h
rename : openvpn/src/openvpn/forward.c => main/openvpn/src/openvpn/forward.c
rename : openvpn/src/openvpn/forward.h => main/openvpn/src/openvpn/forward.h
rename : openvpn/src/openvpn/fragment.c => main/openvpn/src/openvpn/fragment.c
rename : openvpn/src/openvpn/fragment.h => main/openvpn/src/openvpn/fragment.h
rename : openvpn/src/openvpn/gremlin.c => main/openvpn/src/openvpn/gremlin.c
rename : openvpn/src/openvpn/gremlin.h => main/openvpn/src/openvpn/gremlin.h
rename : openvpn/src/openvpn/helper.c => main/openvpn/src/openvpn/helper.c
rename : openvpn/src/openvpn/helper.h => main/openvpn/src/openvpn/helper.h
rename : openvpn/src/openvpn/httpdigest.c => main/openvpn/src/openvpn/httpdigest.c
rename : openvpn/src/openvpn/httpdigest.h => main/openvpn/src/openvpn/httpdigest.h
rename : openvpn/src/openvpn/init.c => main/openvpn/src/openvpn/init.c
rename : openvpn/src/openvpn/init.h => main/openvpn/src/openvpn/init.h
rename : openvpn/src/openvpn/integer.h => main/openvpn/src/openvpn/integer.h
rename : openvpn/src/openvpn/interval.c => main/openvpn/src/openvpn/interval.c
rename : openvpn/src/openvpn/interval.h => main/openvpn/src/openvpn/interval.h
rename : openvpn/src/openvpn/list.c => main/openvpn/src/openvpn/list.c
rename : openvpn/src/openvpn/list.h => main/openvpn/src/openvpn/list.h
rename : openvpn/src/openvpn/lladdr.c => main/openvpn/src/openvpn/lladdr.c
rename : openvpn/src/openvpn/lladdr.h => main/openvpn/src/openvpn/lladdr.h
rename : openvpn/src/openvpn/lzo.c => main/openvpn/src/openvpn/lzo.c
rename : openvpn/src/openvpn/lzo.h => main/openvpn/src/openvpn/lzo.h
rename : openvpn/src/openvpn/manage.c => main/openvpn/src/openvpn/manage.c
rename : openvpn/src/openvpn/manage.h => main/openvpn/src/openvpn/manage.h
rename : openvpn/src/openvpn/mbuf.c => main/openvpn/src/openvpn/mbuf.c
rename : openvpn/src/openvpn/mbuf.h => main/openvpn/src/openvpn/mbuf.h
rename : openvpn/src/openvpn/memdbg.h => main/openvpn/src/openvpn/memdbg.h
rename : openvpn/src/openvpn/misc.c => main/openvpn/src/openvpn/misc.c
rename : openvpn/src/openvpn/misc.h => main/openvpn/src/openvpn/misc.h
rename : openvpn/src/openvpn/mroute.c => main/openvpn/src/openvpn/mroute.c
rename : openvpn/src/openvpn/mroute.h => main/openvpn/src/openvpn/mroute.h
rename : openvpn/src/openvpn/mss.c => main/openvpn/src/openvpn/mss.c
rename : openvpn/src/openvpn/mss.h => main/openvpn/src/openvpn/mss.h
rename : openvpn/src/openvpn/mstats.c => main/openvpn/src/openvpn/mstats.c
rename : openvpn/src/openvpn/mstats.h => main/openvpn/src/openvpn/mstats.h
rename : openvpn/src/openvpn/mtcp.c => main/openvpn/src/openvpn/mtcp.c
rename : openvpn/src/openvpn/mtcp.h => main/openvpn/src/openvpn/mtcp.h
rename : openvpn/src/openvpn/mtu.c => main/openvpn/src/openvpn/mtu.c
rename : openvpn/src/openvpn/mtu.h => main/openvpn/src/openvpn/mtu.h
rename : openvpn/src/openvpn/mudp.c => main/openvpn/src/openvpn/mudp.c
rename : openvpn/src/openvpn/mudp.h => main/openvpn/src/openvpn/mudp.h
rename : openvpn/src/openvpn/multi.c => main/openvpn/src/openvpn/multi.c
rename : openvpn/src/openvpn/multi.h => main/openvpn/src/openvpn/multi.h
rename : openvpn/src/openvpn/ntlm.c => main/openvpn/src/openvpn/ntlm.c
rename : openvpn/src/openvpn/ntlm.h => main/openvpn/src/openvpn/ntlm.h
rename : openvpn/src/openvpn/occ-inline.h => main/openvpn/src/openvpn/occ-inline.h
rename : openvpn/src/openvpn/occ.c => main/openvpn/src/openvpn/occ.c
rename : openvpn/src/openvpn/occ.h => main/openvpn/src/openvpn/occ.h
rename : openvpn/src/openvpn/openvpn.c => main/openvpn/src/openvpn/openvpn.c
rename : openvpn/src/openvpn/openvpn.h => main/openvpn/src/openvpn/openvpn.h
rename : openvpn/src/openvpn/openvpn.vcxproj => main/openvpn/src/openvpn/openvpn.vcxproj
rename : openvpn/src/openvpn/openvpn.vcxproj.filters => main/openvpn/src/openvpn/openvpn.vcxproj.filters
rename : openvpn/src/openvpn/openvpn_win32_resources.rc => main/openvpn/src/openvpn/openvpn_win32_resources.rc
rename : openvpn/src/openvpn/options.c => main/openvpn/src/openvpn/options.c
rename : openvpn/src/openvpn/options.h => main/openvpn/src/openvpn/options.h
rename : openvpn/src/openvpn/otime.c => main/openvpn/src/openvpn/otime.c
rename : openvpn/src/openvpn/otime.h => main/openvpn/src/openvpn/otime.h
rename : openvpn/src/openvpn/packet_id.c => main/openvpn/src/openvpn/packet_id.c
rename : openvpn/src/openvpn/packet_id.h => main/openvpn/src/openvpn/packet_id.h
rename : openvpn/src/openvpn/perf.c => main/openvpn/src/openvpn/perf.c
rename : openvpn/src/openvpn/perf.h => main/openvpn/src/openvpn/perf.h
rename : openvpn/src/openvpn/pf-inline.h => main/openvpn/src/openvpn/pf-inline.h
rename : openvpn/src/openvpn/pf.c => main/openvpn/src/openvpn/pf.c
rename : openvpn/src/openvpn/pf.h => main/openvpn/src/openvpn/pf.h
rename : openvpn/src/openvpn/ping-inline.h => main/openvpn/src/openvpn/ping-inline.h
rename : openvpn/src/openvpn/ping.c => main/openvpn/src/openvpn/ping.c
rename : openvpn/src/openvpn/ping.h => main/openvpn/src/openvpn/ping.h
rename : openvpn/src/openvpn/pkcs11.c => main/openvpn/src/openvpn/pkcs11.c
rename : openvpn/src/openvpn/pkcs11.h => main/openvpn/src/openvpn/pkcs11.h
rename : openvpn/src/openvpn/pkcs11_backend.h => main/openvpn/src/openvpn/pkcs11_backend.h
rename : openvpn/src/openvpn/pkcs11_openssl.c => main/openvpn/src/openvpn/pkcs11_openssl.c
rename : openvpn/src/openvpn/pkcs11_polarssl.c => main/openvpn/src/openvpn/pkcs11_polarssl.c
rename : openvpn/src/openvpn/platform.c => main/openvpn/src/openvpn/platform.c
rename : openvpn/src/openvpn/platform.h => main/openvpn/src/openvpn/platform.h
rename : openvpn/src/openvpn/plugin.c => main/openvpn/src/openvpn/plugin.c
rename : openvpn/src/openvpn/plugin.h => main/openvpn/src/openvpn/plugin.h
rename : openvpn/src/openvpn/pool.c => main/openvpn/src/openvpn/pool.c
rename : openvpn/src/openvpn/pool.h => main/openvpn/src/openvpn/pool.h
rename : openvpn/src/openvpn/proto.c => main/openvpn/src/openvpn/proto.c
rename : openvpn/src/openvpn/proto.h => main/openvpn/src/openvpn/proto.h
rename : openvpn/src/openvpn/proxy.c => main/openvpn/src/openvpn/proxy.c
rename : openvpn/src/openvpn/proxy.h => main/openvpn/src/openvpn/proxy.h
rename : openvpn/src/openvpn/ps.c => main/openvpn/src/openvpn/ps.c
rename : openvpn/src/openvpn/ps.h => main/openvpn/src/openvpn/ps.h
rename : openvpn/src/openvpn/push.c => main/openvpn/src/openvpn/push.c
rename : openvpn/src/openvpn/push.h => main/openvpn/src/openvpn/push.h
rename : openvpn/src/openvpn/pushlist.h => main/openvpn/src/openvpn/pushlist.h
rename : openvpn/src/openvpn/reliable.c => main/openvpn/src/openvpn/reliable.c
rename : openvpn/src/openvpn/reliable.h => main/openvpn/src/openvpn/reliable.h
rename : openvpn/src/openvpn/route.c => main/openvpn/src/openvpn/route.c
rename : openvpn/src/openvpn/route.h => main/openvpn/src/openvpn/route.h
rename : openvpn/src/openvpn/schedule.c => main/openvpn/src/openvpn/schedule.c
rename : openvpn/src/openvpn/schedule.h => main/openvpn/src/openvpn/schedule.h
rename : openvpn/src/openvpn/session_id.c => main/openvpn/src/openvpn/session_id.c
rename : openvpn/src/openvpn/session_id.h => main/openvpn/src/openvpn/session_id.h
rename : openvpn/src/openvpn/shaper.c => main/openvpn/src/openvpn/shaper.c
rename : openvpn/src/openvpn/shaper.h => main/openvpn/src/openvpn/shaper.h
rename : openvpn/src/openvpn/sig.c => main/openvpn/src/openvpn/sig.c
rename : openvpn/src/openvpn/sig.h => main/openvpn/src/openvpn/sig.h
rename : openvpn/src/openvpn/snappy.c => main/openvpn/src/openvpn/snappy.c
rename : openvpn/src/openvpn/snappy.h => main/openvpn/src/openvpn/snappy.h
rename : openvpn/src/openvpn/socket.c => main/openvpn/src/openvpn/socket.c
rename : openvpn/src/openvpn/socket.h => main/openvpn/src/openvpn/socket.h
rename : openvpn/src/openvpn/socks.c => main/openvpn/src/openvpn/socks.c
rename : openvpn/src/openvpn/socks.h => main/openvpn/src/openvpn/socks.h
rename : openvpn/src/openvpn/ssl.c => main/openvpn/src/openvpn/ssl.c
rename : openvpn/src/openvpn/ssl.h => main/openvpn/src/openvpn/ssl.h
rename : openvpn/src/openvpn/ssl_backend.h => main/openvpn/src/openvpn/ssl_backend.h
rename : openvpn/src/openvpn/ssl_common.h => main/openvpn/src/openvpn/ssl_common.h
rename : openvpn/src/openvpn/ssl_openssl.c => main/openvpn/src/openvpn/ssl_openssl.c
rename : openvpn/src/openvpn/ssl_openssl.h => main/openvpn/src/openvpn/ssl_openssl.h
rename : openvpn/src/openvpn/ssl_polarssl.c => main/openvpn/src/openvpn/ssl_polarssl.c
rename : openvpn/src/openvpn/ssl_polarssl.h => main/openvpn/src/openvpn/ssl_polarssl.h
rename : openvpn/src/openvpn/ssl_verify.c => main/openvpn/src/openvpn/ssl_verify.c
rename : openvpn/src/openvpn/ssl_verify.h => main/openvpn/src/openvpn/ssl_verify.h
rename : openvpn/src/openvpn/ssl_verify_backend.h => main/openvpn/src/openvpn/ssl_verify_backend.h
rename : openvpn/src/openvpn/ssl_verify_openssl.c => main/openvpn/src/openvpn/ssl_verify_openssl.c
rename : openvpn/src/openvpn/ssl_verify_openssl.h => main/openvpn/src/openvpn/ssl_verify_openssl.h
rename : openvpn/src/openvpn/ssl_verify_polarssl.c => main/openvpn/src/openvpn/ssl_verify_polarssl.c
rename : openvpn/src/openvpn/ssl_verify_polarssl.h => main/openvpn/src/openvpn/ssl_verify_polarssl.h
rename : openvpn/src/openvpn/status.c => main/openvpn/src/openvpn/status.c
rename : openvpn/src/openvpn/status.h => main/openvpn/src/openvpn/status.h
rename : openvpn/src/openvpn/syshead.h => main/openvpn/src/openvpn/syshead.h
rename : openvpn/src/openvpn/tun.c => main/openvpn/src/openvpn/tun.c
rename : openvpn/src/openvpn/tun.h => main/openvpn/src/openvpn/tun.h
rename : openvpn/src/openvpn/win32.c => main/openvpn/src/openvpn/win32.c
rename : openvpn/src/openvpn/win32.h => main/openvpn/src/openvpn/win32.h
rename : openvpn/src/openvpnserv/Makefile.am => main/openvpn/src/openvpnserv/Makefile.am
rename : openvpn/src/openvpnserv/openvpnserv.c => main/openvpn/src/openvpnserv/openvpnserv.c
rename : openvpn/src/openvpnserv/openvpnserv.vcxproj => main/openvpn/src/openvpnserv/openvpnserv.vcxproj
rename : openvpn/src/openvpnserv/openvpnserv.vcxproj.filters => main/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters
rename : openvpn/src/openvpnserv/openvpnserv_resources.rc => main/openvpn/src/openvpnserv/openvpnserv_resources.rc
rename : openvpn/src/openvpnserv/service.c => main/openvpn/src/openvpnserv/service.c
rename : openvpn/src/openvpnserv/service.h => main/openvpn/src/openvpnserv/service.h
rename : openvpn/src/plugins/Makefile.am => main/openvpn/src/plugins/Makefile.am
rename : openvpn/src/plugins/Makefile.in => main/openvpn/src/plugins/Makefile.in
rename : openvpn/src/plugins/auth-pam/Makefile.am => main/openvpn/src/plugins/auth-pam/Makefile.am
rename : openvpn/src/plugins/auth-pam/Makefile.in => main/openvpn/src/plugins/auth-pam/Makefile.in
rename : openvpn/src/plugins/auth-pam/README.auth-pam => main/openvpn/src/plugins/auth-pam/README.auth-pam
rename : openvpn/src/plugins/auth-pam/auth-pam.c => main/openvpn/src/plugins/auth-pam/auth-pam.c
rename : openvpn/src/plugins/auth-pam/auth-pam.exports => main/openvpn/src/plugins/auth-pam/auth-pam.exports
rename : openvpn/src/plugins/auth-pam/pamdl.c => main/openvpn/src/plugins/auth-pam/pamdl.c
rename : openvpn/src/plugins/auth-pam/pamdl.h => main/openvpn/src/plugins/auth-pam/pamdl.h
rename : openvpn/src/plugins/down-root/Makefile.am => main/openvpn/src/plugins/down-root/Makefile.am
rename : openvpn/src/plugins/down-root/Makefile.in => main/openvpn/src/plugins/down-root/Makefile.in
rename : openvpn/src/plugins/down-root/README.down-root => main/openvpn/src/plugins/down-root/README.down-root
rename : openvpn/src/plugins/down-root/down-root.c => main/openvpn/src/plugins/down-root/down-root.c
rename : openvpn/src/plugins/down-root/down-root.exports => main/openvpn/src/plugins/down-root/down-root.exports
rename : openvpn/tests/Makefile.am => main/openvpn/tests/Makefile.am
rename : openvpn/tests/t_client.rc-sample => main/openvpn/tests/t_client.rc-sample
rename : openvpn/tests/t_client.sh.in => main/openvpn/tests/t_client.sh.in
rename : openvpn/tests/t_cltsrv-down.sh => main/openvpn/tests/t_cltsrv-down.sh
rename : openvpn/tests/t_cltsrv.sh => main/openvpn/tests/t_cltsrv.sh
rename : openvpn/tests/t_lpback.sh => main/openvpn/tests/t_lpback.sh
rename : openvpn/version.m4 => main/openvpn/version.m4
rename : openvpn/version.sh.in => main/openvpn/version.sh.in
rename : snappy/Android.mk => main/snappy/Android.mk
rename : snappy/COPYING => main/snappy/COPYING
rename : snappy/conf/config.h => main/snappy/conf/config.h
rename : snappy/snappy-c.cc => main/snappy/snappy-c.cc
rename : snappy/snappy-c.h => main/snappy/snappy-c.h
rename : snappy/snappy-internal.h => main/snappy/snappy-internal.h
rename : snappy/snappy-sinksource.cc => main/snappy/snappy-sinksource.cc
rename : snappy/snappy-sinksource.h => main/snappy/snappy-sinksource.h
rename : snappy/snappy-stubs-internal.cc => main/snappy/snappy-stubs-internal.cc
rename : snappy/snappy-stubs-internal.h => main/snappy/snappy-stubs-internal.h
rename : snappy/snappy-stubs-public.h => main/snappy/snappy-stubs-public.h
rename : snappy/snappy-stubs-public.h.in => main/snappy/snappy-stubs-public.h.in
rename : snappy/snappy-test.cc => main/snappy/snappy-test.cc
rename : snappy/snappy-test.h => main/snappy/snappy-test.h
rename : snappy/snappy.cc => main/snappy/snappy.cc
rename : snappy/snappy.h => main/snappy/snappy.h
rename : snappy/snappy_unittest.cc => main/snappy/snappy_unittest.cc
rename : AndroidManifest.xml => main/src/main/AndroidManifest.xml
rename : src/de/blinkt/openvpn/FileProvider.java => main/src/main/java/de/blinkt/openvpn/FileProvider.java
rename : src/de/blinkt/openvpn/LaunchVPN.java => main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
rename : src/de/blinkt/openvpn/OnBootReceiver.java => main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
rename : src/de/blinkt/openvpn/VpnProfile.java => main/src/main/java/de/blinkt/openvpn/VpnProfile.java
rename : src/de/blinkt/openvpn/activities/ConfigConverter.java => main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
rename : src/de/blinkt/openvpn/activities/CreateShortcuts.java => main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
rename : src/de/blinkt/openvpn/activities/DisconnectVPN.java => main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
rename : src/de/blinkt/openvpn/activities/FileSelect.java => main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
rename : src/de/blinkt/openvpn/activities/LogWindow.java => main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
rename : src/de/blinkt/openvpn/activities/MainActivity.java => main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
rename : src/de/blinkt/openvpn/activities/VPNPreferences.java => main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
rename : src/de/blinkt/openvpn/api/APIVpnProfile.java => main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
rename : src/de/blinkt/openvpn/api/ConfirmDialog.java => main/src/main/java/de/blinkt/openvpn/api/ConfirmDialog.java
rename : src/de/blinkt/openvpn/api/ExternalAppDatabase.java => main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
rename : src/de/blinkt/openvpn/api/ExternalOpenVPNService.java => main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
rename : src/de/blinkt/openvpn/api/GrantPermissionsActivity.java => main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
rename : src/de/blinkt/openvpn/api/SecurityRemoteException.java => main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
rename : src/de/blinkt/openvpn/core/CIDRIP.java => main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
rename : src/de/blinkt/openvpn/core/ConfigParser.java => main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
rename : src/de/blinkt/openvpn/core/DeviceStateReceiver.java => main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
rename : src/de/blinkt/openvpn/core/GetRestrictionReceiver.java => main/src/main/java/de/blinkt/openvpn/core/GetRestrictionReceiver.java
rename : src/de/blinkt/openvpn/core/ICSOpenVPNApplication.java => main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
rename : src/de/blinkt/openvpn/core/NativeUtils.java => main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
rename : src/de/blinkt/openvpn/core/NetworkSpace.java => main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
rename : src/de/blinkt/openvpn/core/OpenVPNManagement.java => main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
rename : src/de/blinkt/openvpn/core/OpenVPNThread.java => main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
rename : src/de/blinkt/openvpn/core/OpenVpnManagementThread.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
rename : src/de/blinkt/openvpn/core/OpenVpnService.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
rename : src/de/blinkt/openvpn/core/PRNGFixes.java => main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
rename : src/de/blinkt/openvpn/core/ProfileManager.java => main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
rename : src/de/blinkt/openvpn/core/ProxyDetection.java => main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
rename : src/de/blinkt/openvpn/core/VPNLaunchHelper.java => main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
rename : src/de/blinkt/openvpn/core/VpnStatus.java => main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
rename : src/de/blinkt/openvpn/core/X509Utils.java => main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
rename : src/de/blinkt/openvpn/fragments/AboutFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
rename : src/de/blinkt/openvpn/fragments/FaqFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
rename : src/de/blinkt/openvpn/fragments/FileSelectionFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
rename : src/de/blinkt/openvpn/fragments/GeneralSettings.java => main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
rename : src/de/blinkt/openvpn/fragments/InlineFileTab.java => main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
rename : src/de/blinkt/openvpn/fragments/LogFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
rename : src/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
rename : src/de/blinkt/openvpn/fragments/SendDumpFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
rename : src/de/blinkt/openvpn/fragments/Settings_Authentication.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
rename : src/de/blinkt/openvpn/fragments/Settings_Basic.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
rename : src/de/blinkt/openvpn/fragments/Settings_IP.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
rename : src/de/blinkt/openvpn/fragments/Settings_Obscure.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
rename : src/de/blinkt/openvpn/fragments/Settings_Routing.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
rename : src/de/blinkt/openvpn/fragments/ShowConfigFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
rename : src/de/blinkt/openvpn/fragments/Utils.java => main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
rename : src/de/blinkt/openvpn/fragments/VPNProfileList.java => main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
rename : src/de/blinkt/openvpn/views/FileSelectLayout.java => main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
rename : src/de/blinkt/openvpn/views/RemoteCNPreference.java => main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
rename : src/de/blinkt/openvpn/views/SeekBarTicks.java => main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
rename : src/org/spongycastle/util/encoders/Base64.java => main/src/main/java/org/spongycastle/util/encoders/Base64.java
rename : src/org/spongycastle/util/encoders/Base64Encoder.java => main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
rename : src/org/spongycastle/util/encoders/Encoder.java => main/src/main/java/org/spongycastle/util/encoders/Encoder.java
rename : src/org/spongycastle/util/io/pem/PemGenerationException.java => main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
rename : src/org/spongycastle/util/io/pem/PemHeader.java => main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
rename : src/org/spongycastle/util/io/pem/PemObject.java => main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
rename : src/org/spongycastle/util/io/pem/PemObjectGenerator.java => main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
rename : src/org/spongycastle/util/io/pem/PemReader.java => main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
rename : src/org/spongycastle/util/io/pem/PemWriter.java => main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java
Diffstat (limited to 'openssl/ssl/s3_srvr.c')
-rw-r--r-- | openssl/ssl/s3_srvr.c | 3314 |
1 files changed, 0 insertions, 3314 deletions
diff --git a/openssl/ssl/s3_srvr.c b/openssl/ssl/s3_srvr.c deleted file mode 100644 index 60591622..00000000 --- a/openssl/ssl/s3_srvr.c +++ /dev/null @@ -1,3314 +0,0 @@ -/* ssl/s3_srvr.c -*- mode:C; c-file-style: "eay" -*- */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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 acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS 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 AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ -/* ==================================================================== - * Copyright (c) 1998-2007 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). - * - */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * - * Portions of the attached software ("Contribution") are developed by - * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project. - * - * The Contribution is licensed pursuant to the OpenSSL open source - * license provided above. - * - * ECC cipher suite support in OpenSSL originally written by - * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories. - * - */ -/* ==================================================================== - * Copyright 2005 Nokia. All rights reserved. - * - * The portions of the attached software ("Contribution") is developed by - * Nokia Corporation and is licensed pursuant to the OpenSSL open source - * license. - * - * The Contribution, originally written by Mika Kousa and Pasi Eronen of - * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites - * support (see RFC 4279) to OpenSSL. - * - * No patent licenses or other rights except those expressly stated in - * the OpenSSL open source license shall be deemed granted or received - * expressly, by implication, estoppel, or otherwise. - * - * No assurances are provided by Nokia that the Contribution does not - * infringe the patent or other intellectual property rights of any third - * party or that the license provides you with all the necessary rights - * to make use of the Contribution. - * - * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN - * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA - * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY - * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR - * OTHERWISE. - */ - -#define REUSE_CIPHER_BUG -#define NETSCAPE_HANG_BUG - -#include <stdio.h> -#include "ssl_locl.h" -#include "kssl_lcl.h" -#include <openssl/buffer.h> -#include <openssl/rand.h> -#include <openssl/objects.h> -#include <openssl/evp.h> -#include <openssl/hmac.h> -#include <openssl/x509.h> -#ifndef OPENSSL_NO_DH -#include <openssl/dh.h> -#endif -#include <openssl/bn.h> -#ifndef OPENSSL_NO_KRB5 -#include <openssl/krb5_asn.h> -#endif -#include <openssl/md5.h> - -static const SSL_METHOD *ssl3_get_server_method(int ver); - -static const SSL_METHOD *ssl3_get_server_method(int ver) - { - if (ver == SSL3_VERSION) - return(SSLv3_server_method()); - else - return(NULL); - } - -IMPLEMENT_ssl3_meth_func(SSLv3_server_method, - ssl3_accept, - ssl_undefined_function, - ssl3_get_server_method) - -int ssl3_accept(SSL *s) - { - BUF_MEM *buf; - unsigned long alg_k,Time=(unsigned long)time(NULL); - void (*cb)(const SSL *ssl,int type,int val)=NULL; - int ret= -1; - int new_state,state,skip=0; - - RAND_add(&Time,sizeof(Time),0); - ERR_clear_error(); - clear_sys_error(); - - if (s->info_callback != NULL) - cb=s->info_callback; - else if (s->ctx->info_callback != NULL) - cb=s->ctx->info_callback; - - /* init things to blank */ - s->in_handshake++; - if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); - - if (s->cert == NULL) - { - SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_NO_CERTIFICATE_SET); - return(-1); - } - - for (;;) - { - state=s->state; - - switch (s->state) - { - case SSL_ST_RENEGOTIATE: - s->new_session=1; - /* s->state=SSL_ST_ACCEPT; */ - - case SSL_ST_BEFORE: - case SSL_ST_ACCEPT: - case SSL_ST_BEFORE|SSL_ST_ACCEPT: - case SSL_ST_OK|SSL_ST_ACCEPT: - - s->server=1; - if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1); - - if ((s->version>>8) != 3) - { - SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR); - return -1; - } - s->type=SSL_ST_ACCEPT; - - if (s->init_buf == NULL) - { - if ((buf=BUF_MEM_new()) == NULL) - { - ret= -1; - goto end; - } - if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH)) - { - ret= -1; - goto end; - } - s->init_buf=buf; - } - - if (!ssl3_setup_buffers(s)) - { - ret= -1; - goto end; - } - - s->init_num=0; - - if (s->state != SSL_ST_RENEGOTIATE) - { - /* Ok, we now need to push on a buffering BIO so that - * the output is sent in a way that TCP likes :-) - */ - if (!ssl_init_wbio_buffer(s,1)) { ret= -1; goto end; } - - ssl3_init_finished_mac(s); - s->state=SSL3_ST_SR_CLNT_HELLO_A; - s->ctx->stats.sess_accept++; - } - else if (!s->s3->send_connection_binding && - !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) - { - /* Server attempting to renegotiate with - * client that doesn't support secure - * renegotiation. - */ - SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); - ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE); - ret = -1; - goto end; - } - else - { - /* s->state == SSL_ST_RENEGOTIATE, - * we will just send a HelloRequest */ - s->ctx->stats.sess_accept_renegotiate++; - s->state=SSL3_ST_SW_HELLO_REQ_A; - } - break; - - case SSL3_ST_SW_HELLO_REQ_A: - case SSL3_ST_SW_HELLO_REQ_B: - - s->shutdown=0; - ret=ssl3_send_hello_request(s); - if (ret <= 0) goto end; - s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C; - s->state=SSL3_ST_SW_FLUSH; - s->init_num=0; - - ssl3_init_finished_mac(s); - break; - - case SSL3_ST_SW_HELLO_REQ_C: - s->state=SSL_ST_OK; - break; - - case SSL3_ST_SR_CLNT_HELLO_A: - case SSL3_ST_SR_CLNT_HELLO_B: - case SSL3_ST_SR_CLNT_HELLO_C: - - s->shutdown=0; - ret=ssl3_get_client_hello(s); - if (ret <= 0) goto end; - - s->new_session = 2; - s->state=SSL3_ST_SW_SRVR_HELLO_A; - s->init_num=0; - break; - - case SSL3_ST_SW_SRVR_HELLO_A: - case SSL3_ST_SW_SRVR_HELLO_B: - ret=ssl3_send_server_hello(s); - if (ret <= 0) goto end; -#ifndef OPENSSL_NO_TLSEXT - if (s->hit) - { - if (s->tlsext_ticket_expected) - s->state=SSL3_ST_SW_SESSION_TICKET_A; - else - s->state=SSL3_ST_SW_CHANGE_A; - } -#else - if (s->hit) - s->state=SSL3_ST_SW_CHANGE_A; -#endif - else - s->state=SSL3_ST_SW_CERT_A; - s->init_num=0; - break; - - case SSL3_ST_SW_CERT_A: - case SSL3_ST_SW_CERT_B: - /* Check if it is anon DH or anon ECDH, */ - /* normal PSK or KRB5 */ - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) - && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK) - && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)) - { - ret=ssl3_send_server_certificate(s); - if (ret <= 0) goto end; -#ifndef OPENSSL_NO_TLSEXT - if (s->tlsext_status_expected) - s->state=SSL3_ST_SW_CERT_STATUS_A; - else - s->state=SSL3_ST_SW_KEY_EXCH_A; - } - else - { - skip = 1; - s->state=SSL3_ST_SW_KEY_EXCH_A; - } -#else - } - else - skip=1; - - s->state=SSL3_ST_SW_KEY_EXCH_A; -#endif - s->init_num=0; - break; - - case SSL3_ST_SW_KEY_EXCH_A: - case SSL3_ST_SW_KEY_EXCH_B: - alg_k = s->s3->tmp.new_cipher->algorithm_mkey; - - /* clear this, it may get reset by - * send_server_key_exchange */ - if ((s->options & SSL_OP_EPHEMERAL_RSA) -#ifndef OPENSSL_NO_KRB5 - && !(alg_k & SSL_kKRB5) -#endif /* OPENSSL_NO_KRB5 */ - ) - /* option SSL_OP_EPHEMERAL_RSA sends temporary RSA key - * even when forbidden by protocol specs - * (handshake may fail as clients are not required to - * be able to handle this) */ - s->s3->tmp.use_rsa_tmp=1; - else - s->s3->tmp.use_rsa_tmp=0; - - - /* only send if a DH key exchange, fortezza or - * RSA but we have a sign only certificate - * - * PSK: may send PSK identity hints - * - * For ECC ciphersuites, we send a serverKeyExchange - * message only if the cipher suite is either - * ECDH-anon or ECDHE. In other cases, the - * server certificate contains the server's - * public key for key exchange. - */ - if (s->s3->tmp.use_rsa_tmp - /* PSK: send ServerKeyExchange if PSK identity - * hint if provided */ -#ifndef OPENSSL_NO_PSK - || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint) -#endif - || (alg_k & (SSL_kDHr|SSL_kDHd|SSL_kEDH)) - || (alg_k & SSL_kEECDH) - || ((alg_k & SSL_kRSA) - && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL - || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) - && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) - ) - ) - ) - ) - { - ret=ssl3_send_server_key_exchange(s); - if (ret <= 0) goto end; - } - else - skip=1; - - s->state=SSL3_ST_SW_CERT_REQ_A; - s->init_num=0; - break; - - case SSL3_ST_SW_CERT_REQ_A: - case SSL3_ST_SW_CERT_REQ_B: - if (/* don't request cert unless asked for it: */ - !(s->verify_mode & SSL_VERIFY_PEER) || - /* if SSL_VERIFY_CLIENT_ONCE is set, - * don't request cert during re-negotiation: */ - ((s->session->peer != NULL) && - (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) || - /* never request cert in anonymous ciphersuites - * (see section "Certificate request" in SSL 3 drafts - * and in RFC 2246): */ - ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) && - /* ... except when the application insists on verification - * (against the specs, but s3_clnt.c accepts this for SSL 3) */ - !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) || - /* never request cert in Kerberos ciphersuites */ - (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) - /* With normal PSK Certificates and - * Certificate Requests are omitted */ - || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) - { - /* no cert request */ - skip=1; - s->s3->tmp.cert_request=0; - s->state=SSL3_ST_SW_SRVR_DONE_A; - } - else - { - s->s3->tmp.cert_request=1; - ret=ssl3_send_certificate_request(s); - if (ret <= 0) goto end; -#ifndef NETSCAPE_HANG_BUG - s->state=SSL3_ST_SW_SRVR_DONE_A; -#else - s->state=SSL3_ST_SW_FLUSH; - s->s3->tmp.next_state=SSL3_ST_SR_CERT_A; -#endif - s->init_num=0; - } - break; - - case SSL3_ST_SW_SRVR_DONE_A: - case SSL3_ST_SW_SRVR_DONE_B: - ret=ssl3_send_server_done(s); - if (ret <= 0) goto end; - s->s3->tmp.next_state=SSL3_ST_SR_CERT_A; - s->state=SSL3_ST_SW_FLUSH; - s->init_num=0; - break; - - case SSL3_ST_SW_FLUSH: - - /* This code originally checked to see if - * any data was pending using BIO_CTRL_INFO - * and then flushed. This caused problems - * as documented in PR#1939. The proposed - * fix doesn't completely resolve this issue - * as buggy implementations of BIO_CTRL_PENDING - * still exist. So instead we just flush - * unconditionally. - */ - - s->rwstate=SSL_WRITING; - if (BIO_flush(s->wbio) <= 0) - { - ret= -1; - goto end; - } - s->rwstate=SSL_NOTHING; - - s->state=s->s3->tmp.next_state; - break; - - case SSL3_ST_SR_CERT_A: - case SSL3_ST_SR_CERT_B: - /* Check for second client hello (MS SGC) */ - ret = ssl3_check_client_hello(s); - if (ret <= 0) - goto end; - if (ret == 2) - s->state = SSL3_ST_SR_CLNT_HELLO_C; - else { - if (s->s3->tmp.cert_request) - { - ret=ssl3_get_client_certificate(s); - if (ret <= 0) goto end; - } - s->init_num=0; - s->state=SSL3_ST_SR_KEY_EXCH_A; - } - break; - - case SSL3_ST_SR_KEY_EXCH_A: - case SSL3_ST_SR_KEY_EXCH_B: - ret=ssl3_get_client_key_exchange(s); - if (ret <= 0) - goto end; - if (ret == 2) - { - /* For the ECDH ciphersuites when - * the client sends its ECDH pub key in - * a certificate, the CertificateVerify - * message is not sent. - * Also for GOST ciphersuites when - * the client uses its key from the certificate - * for key exchange. - */ -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) - s->state=SSL3_ST_SR_FINISHED_A; -#else - if (s->s3->next_proto_neg_seen) - s->state=SSL3_ST_SR_NEXT_PROTO_A; - else - s->state=SSL3_ST_SR_FINISHED_A; -#endif - s->init_num = 0; - } - else - { - int offset=0; - int dgst_num; - - s->state=SSL3_ST_SR_CERT_VRFY_A; - s->init_num=0; - - /* We need to get hashes here so if there is - * a client cert, it can be verified - * FIXME - digest processing for CertificateVerify - * should be generalized. But it is next step - */ - if (s->s3->handshake_buffer) - if (!ssl3_digest_cached_records(s)) - return -1; - for (dgst_num=0; dgst_num<SSL_MAX_DIGEST;dgst_num++) - if (s->s3->handshake_dgst[dgst_num]) - { - int dgst_size; - - s->method->ssl3_enc->cert_verify_mac(s,EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]),&(s->s3->tmp.cert_verify_md[offset])); - dgst_size=EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]); - if (dgst_size < 0) - { - ret = -1; - goto end; - } - offset+=dgst_size; - } - } - break; - - case SSL3_ST_SR_CERT_VRFY_A: - case SSL3_ST_SR_CERT_VRFY_B: - - /* we should decide if we expected this one */ - ret=ssl3_get_cert_verify(s); - if (ret <= 0) goto end; - -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) - s->state=SSL3_ST_SR_FINISHED_A; -#else - if (s->s3->next_proto_neg_seen) - s->state=SSL3_ST_SR_NEXT_PROTO_A; - else - s->state=SSL3_ST_SR_FINISHED_A; -#endif - s->init_num=0; - break; - -#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) - case SSL3_ST_SR_NEXT_PROTO_A: - case SSL3_ST_SR_NEXT_PROTO_B: - ret=ssl3_get_next_proto(s); - if (ret <= 0) goto end; - s->init_num = 0; - s->state=SSL3_ST_SR_FINISHED_A; - break; -#endif - - case SSL3_ST_SR_FINISHED_A: - case SSL3_ST_SR_FINISHED_B: - ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A, - SSL3_ST_SR_FINISHED_B); - if (ret <= 0) goto end; -#ifndef OPENSSL_NO_TLSEXT - if (s->tlsext_ticket_expected) - s->state=SSL3_ST_SW_SESSION_TICKET_A; - else if (s->hit) - s->state=SSL_ST_OK; -#else - if (s->hit) - s->state=SSL_ST_OK; -#endif - else - s->state=SSL3_ST_SW_CHANGE_A; - s->init_num=0; - break; - -#ifndef OPENSSL_NO_TLSEXT - case SSL3_ST_SW_SESSION_TICKET_A: - case SSL3_ST_SW_SESSION_TICKET_B: - ret=ssl3_send_newsession_ticket(s); - if (ret <= 0) goto end; - s->state=SSL3_ST_SW_CHANGE_A; - s->init_num=0; - break; - - case SSL3_ST_SW_CERT_STATUS_A: - case SSL3_ST_SW_CERT_STATUS_B: - ret=ssl3_send_cert_status(s); - if (ret <= 0) goto end; - s->state=SSL3_ST_SW_KEY_EXCH_A; - s->init_num=0; - break; - -#endif - - case SSL3_ST_SW_CHANGE_A: - case SSL3_ST_SW_CHANGE_B: - - s->session->cipher=s->s3->tmp.new_cipher; - if (!s->method->ssl3_enc->setup_key_block(s)) - { ret= -1; goto end; } - - ret=ssl3_send_change_cipher_spec(s, - SSL3_ST_SW_CHANGE_A,SSL3_ST_SW_CHANGE_B); - - if (ret <= 0) goto end; - s->state=SSL3_ST_SW_FINISHED_A; - s->init_num=0; - - if (!s->method->ssl3_enc->change_cipher_state(s, - SSL3_CHANGE_CIPHER_SERVER_WRITE)) - { - ret= -1; - goto end; - } - - break; - - case SSL3_ST_SW_FINISHED_A: - case SSL3_ST_SW_FINISHED_B: - ret=ssl3_send_finished(s, - SSL3_ST_SW_FINISHED_A,SSL3_ST_SW_FINISHED_B, - s->method->ssl3_enc->server_finished_label, - s->method->ssl3_enc->server_finished_label_len); - if (ret <= 0) goto end; - s->state=SSL3_ST_SW_FLUSH; - if (s->hit) - { -#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG) - s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; -#else - if (s->s3->next_proto_neg_seen) - s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A; - else - s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; -#endif - } - else - s->s3->tmp.next_state=SSL_ST_OK; - s->init_num=0; - break; - - case SSL_ST_OK: - /* clean a few things up */ - ssl3_cleanup_key_block(s); - - BUF_MEM_free(s->init_buf); - s->init_buf=NULL; - - /* remove buffering on output */ - ssl_free_wbio_buffer(s); - - s->init_num=0; - - if (s->new_session == 2) /* skipped if we just sent a HelloRequest */ - { - /* actually not necessarily a 'new' session unless - * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */ - - s->new_session=0; - - ssl_update_cache(s,SSL_SESS_CACHE_SERVER); - - s->ctx->stats.sess_accept_good++; - /* s->server=1; */ - s->handshake_func=ssl3_accept; - - if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1); - } - - ret = 1; - goto end; - /* break; */ - - default: - SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_UNKNOWN_STATE); - ret= -1; - goto end; - /* break; */ - } - - if (!s->s3->tmp.reuse_message && !skip) - { - if (s->debug) - { - if ((ret=BIO_flush(s->wbio)) <= 0) - goto end; - } - - - if ((cb != NULL) && (s->state != state)) - { - new_state=s->state; - s->state=state; - cb(s,SSL_CB_ACCEPT_LOOP,1); - s->state=new_state; - } - } - skip=0; - } -end: - /* BIO_flush(s->wbio); */ - - s->in_handshake--; - if (cb != NULL) - cb(s,SSL_CB_ACCEPT_EXIT,ret); - return(ret); - } - -int ssl3_send_hello_request(SSL *s) - { - unsigned char *p; - - if (s->state == SSL3_ST_SW_HELLO_REQ_A) - { - p=(unsigned char *)s->init_buf->data; - *(p++)=SSL3_MT_HELLO_REQUEST; - *(p++)=0; - *(p++)=0; - *(p++)=0; - - s->state=SSL3_ST_SW_HELLO_REQ_B; - /* number of bytes to write */ - s->init_num=4; - s->init_off=0; - } - - /* SSL3_ST_SW_HELLO_REQ_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } - -int ssl3_check_client_hello(SSL *s) - { - int ok; - long n; - - /* this function is called when we really expect a Certificate message, - * so permit appropriate message length */ - n=s->method->ssl_get_message(s, - SSL3_ST_SR_CERT_A, - SSL3_ST_SR_CERT_B, - -1, - s->max_cert_list, - &ok); - if (!ok) return((int)n); - s->s3->tmp.reuse_message = 1; - if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO) - { - /* Throw away what we have done so far in the current handshake, - * which will now be aborted. (A full SSL_clear would be too much.) */ -#ifndef OPENSSL_NO_DH - if (s->s3->tmp.dh != NULL) - { - DH_free(s->s3->tmp.dh); - s->s3->tmp.dh = NULL; - } -#endif -#ifndef OPENSSL_NO_ECDH - if (s->s3->tmp.ecdh != NULL) - { - EC_KEY_free(s->s3->tmp.ecdh); - s->s3->tmp.ecdh = NULL; - } -#endif - return 2; - } - return 1; -} - -int ssl3_get_client_hello(SSL *s) - { - int i,j,ok,al,ret= -1; - unsigned int cookie_len; - long n; - unsigned long id; - unsigned char *p,*d,*q; - SSL_CIPHER *c; -#ifndef OPENSSL_NO_COMP - SSL_COMP *comp=NULL; -#endif - STACK_OF(SSL_CIPHER) *ciphers=NULL; - - /* We do this so that we will respond with our native type. - * If we are TLSv1 and we get SSLv3, we will respond with TLSv1, - * This down switching should be handled by a different method. - * If we are SSLv3, we will respond with SSLv3, even if prompted with - * TLSv1. - */ - if (s->state == SSL3_ST_SR_CLNT_HELLO_A) - { - s->state=SSL3_ST_SR_CLNT_HELLO_B; - } - s->first_packet=1; - n=s->method->ssl_get_message(s, - SSL3_ST_SR_CLNT_HELLO_B, - SSL3_ST_SR_CLNT_HELLO_C, - SSL3_MT_CLIENT_HELLO, - SSL3_RT_MAX_PLAIN_LENGTH, - &ok); - - if (!ok) return((int)n); - s->first_packet=0; - d=p=(unsigned char *)s->init_msg; - - /* use version from inside client hello, not from record header - * (may differ: see RFC 2246, Appendix E, second paragraph) */ - s->client_version=(((int)p[0])<<8)|(int)p[1]; - p+=2; - - if ((s->version == DTLS1_VERSION && s->client_version > s->version) || - (s->version != DTLS1_VERSION && s->client_version < s->version)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_WRONG_VERSION_NUMBER); - if ((s->client_version>>8) == SSL3_VERSION_MAJOR) - { - /* similar to ssl3_get_record, send alert using remote version number */ - s->version = s->client_version; - } - al = SSL_AD_PROTOCOL_VERSION; - goto f_err; - } - - /* If we require cookies and this ClientHello doesn't - * contain one, just return since we do not want to - * allocate any memory yet. So check cookie length... - */ - if (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) - { - unsigned int session_length, cookie_length; - - session_length = *(p + SSL3_RANDOM_SIZE); - cookie_length = *(p + SSL3_RANDOM_SIZE + session_length + 1); - - if (cookie_length == 0) - return 1; - } - - /* load the client random */ - memcpy(s->s3->client_random,p,SSL3_RANDOM_SIZE); - p+=SSL3_RANDOM_SIZE; - - /* get the session-id */ - j= *(p++); - - s->hit=0; - /* Versions before 0.9.7 always allow session reuse during renegotiation - * (i.e. when s->new_session is true), option - * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is new with 0.9.7. - * Maybe this optional behaviour should always have been the default, - * but we cannot safely change the default behaviour (or new applications - * might be written that become totally unsecure when compiled with - * an earlier library version) - */ - if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) - { - if (!s->session_creation_enabled) - { - ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE); - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_SESSION_MAY_NOT_BE_CREATED); - goto err; - } - if (!ssl_get_new_session(s,1)) - goto err; - } - else - { - i=ssl_get_prev_session(s, p, j, d + n); - if (i == 1) - { /* previous session */ - s->hit=1; - } - else if (i == -1) - goto err; - else /* i == 0 */ - { - if (!s->session_creation_enabled) - { - ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE); - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_SESSION_MAY_NOT_BE_CREATED); - goto err; - } - if (!ssl_get_new_session(s,1)) - goto err; - } - } - - p+=j; - - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) - { - /* cookie stuff */ - cookie_len = *(p++); - - /* - * The ClientHello may contain a cookie even if the - * HelloVerify message has not been sent--make sure that it - * does not cause an overflow. - */ - if ( cookie_len > sizeof(s->d1->rcvd_cookie)) - { - /* too much data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_COOKIE_MISMATCH); - goto f_err; - } - - /* verify the cookie if appropriate option is set. */ - if ((SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) && - cookie_len > 0) - { - memcpy(s->d1->rcvd_cookie, p, cookie_len); - - if ( s->ctx->app_verify_cookie_cb != NULL) - { - if ( s->ctx->app_verify_cookie_cb(s, s->d1->rcvd_cookie, - cookie_len) == 0) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, - SSL_R_COOKIE_MISMATCH); - goto f_err; - } - /* else cookie verification succeeded */ - } - else if ( memcmp(s->d1->rcvd_cookie, s->d1->cookie, - s->d1->cookie_len) != 0) /* default verification */ - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, - SSL_R_COOKIE_MISMATCH); - goto f_err; - } - - ret = 2; - } - - p += cookie_len; - } - - n2s(p,i); - if ((i == 0) && (j != 0)) - { - /* we need a cipher if we are not resuming a session */ - al=SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_SPECIFIED); - goto f_err; - } - if ((p+i) >= (d+n)) - { - /* not enough data */ - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH); - goto f_err; - } - if ((i > 0) && (ssl_bytes_to_cipher_list(s,p,i,&(ciphers)) - == NULL)) - { - goto err; - } - p+=i; - - /* If it is a hit, check that the cipher is in the list */ - if ((s->hit) && (i > 0)) - { - j=0; - id=s->session->cipher->id; - -#ifdef CIPHER_DEBUG - printf("client sent %d ciphers\n",sk_num(ciphers)); -#endif - for (i=0; i<sk_SSL_CIPHER_num(ciphers); i++) - { - c=sk_SSL_CIPHER_value(ciphers,i); -#ifdef CIPHER_DEBUG - printf("client [%2d of %2d]:%s\n", - i,sk_num(ciphers),SSL_CIPHER_get_name(c)); -#endif - if (c->id == id) - { - j=1; - break; - } - } -/* Disabled because it can be used in a ciphersuite downgrade - * attack: CVE-2010-4180. - */ -#if 0 - if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) - { - /* Special case as client bug workaround: the previously used cipher may - * not be in the current list, the client instead might be trying to - * continue using a cipher that before wasn't chosen due to server - * preferences. We'll have to reject the connection if the cipher is not - * enabled, though. */ - c = sk_SSL_CIPHER_value(ciphers, 0); - if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0) - { - s->session->cipher = c; - j = 1; - } - } -#endif - if (j == 0) - { - /* we need to have the cipher in the cipher - * list if we are asked to reuse it */ - al=SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING); - goto f_err; - } - } - - /* compression */ - i= *(p++); - if ((p+i) > (d+n)) - { - /* not enough data */ - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH); - goto f_err; - } - q=p; - for (j=0; j<i; j++) - { - if (p[j] == 0) break; - } - - p+=i; - if (j >= i) - { - /* no compress */ - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_COMPRESSION_SPECIFIED); - goto f_err; - } - -#ifndef OPENSSL_NO_TLSEXT - /* TLS extensions*/ - if (s->version >= SSL3_VERSION) - { - if (!ssl_parse_clienthello_tlsext(s,&p,d,n, &al)) - { - /* 'al' set by ssl_parse_clienthello_tlsext */ - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PARSE_TLSEXT); - goto f_err; - } - } - if (ssl_check_clienthello_tlsext(s) <= 0) { - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT); - goto err; - } - - /* Check if we want to use external pre-shared secret for this - * handshake for not reused session only. We need to generate - * server_random before calling tls_session_secret_cb in order to allow - * SessionTicket processing to use it in key derivation. */ - { - unsigned long Time; - unsigned char *pos; - Time=(unsigned long)time(NULL); /* Time */ - pos=s->s3->server_random; - l2n(Time,pos); - if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0) - { - al=SSL_AD_INTERNAL_ERROR; - goto f_err; - } - } - - if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb) - { - SSL_CIPHER *pref_cipher=NULL; - - s->session->master_key_length=sizeof(s->session->master_key); - if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length, - ciphers, &pref_cipher, s->tls_session_secret_cb_arg)) - { - s->hit=1; - s->session->ciphers=ciphers; - s->session->verify_result=X509_V_OK; - - ciphers=NULL; - - /* check if some cipher was preferred by call back */ - pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s)); - if (pref_cipher == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER); - goto f_err; - } - - s->session->cipher=pref_cipher; - - if (s->cipher_list) - sk_SSL_CIPHER_free(s->cipher_list); - - if (s->cipher_list_by_id) - sk_SSL_CIPHER_free(s->cipher_list_by_id); - - s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers); - s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers); - } - } -#endif - - /* Worst case, we will use the NULL compression, but if we have other - * options, we will now look for them. We have i-1 compression - * algorithms from the client, starting at q. */ - s->s3->tmp.new_compression=NULL; -#ifndef OPENSSL_NO_COMP - /* This only happens if we have a cache hit */ - if (s->session->compress_meth != 0) - { - int m, comp_id = s->session->compress_meth; - /* Perform sanity checks on resumed compression algorithm */ - /* Can't disable compression */ - if (s->options & SSL_OP_NO_COMPRESSION) - { - al=SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION); - goto f_err; - } - /* Look for resumed compression method */ - for (m = 0; m < sk_SSL_COMP_num(s->ctx->comp_methods); m++) - { - comp=sk_SSL_COMP_value(s->ctx->comp_methods,m); - if (comp_id == comp->id) - { - s->s3->tmp.new_compression=comp; - break; - } - } - if (s->s3->tmp.new_compression == NULL) - { - al=SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INVALID_COMPRESSION_ALGORITHM); - goto f_err; - } - /* Look for resumed method in compression list */ - for (m = 0; m < i; m++) - { - if (q[m] == comp_id) - break; - } - if (m >= i) - { - al=SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING); - goto f_err; - } - } - else if (s->hit) - comp = NULL; - else if (!(s->options & SSL_OP_NO_COMPRESSION) && s->ctx->comp_methods) - { /* See if we have a match */ - int m,nn,o,v,done=0; - - nn=sk_SSL_COMP_num(s->ctx->comp_methods); - for (m=0; m<nn; m++) - { - comp=sk_SSL_COMP_value(s->ctx->comp_methods,m); - v=comp->id; - for (o=0; o<i; o++) - { - if (v == q[o]) - { - done=1; - break; - } - } - if (done) break; - } - if (done) - s->s3->tmp.new_compression=comp; - else - comp=NULL; - } -#else - /* If compression is disabled we'd better not try to resume a session - * using compression. - */ - if (s->session->compress_meth != 0) - { - al=SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION); - goto f_err; - } -#endif - - /* Given s->session->ciphers and SSL_get_ciphers, we must - * pick a cipher */ - - if (!s->hit) - { -#ifdef OPENSSL_NO_COMP - s->session->compress_meth=0; -#else - s->session->compress_meth=(comp == NULL)?0:comp->id; -#endif - if (s->session->ciphers != NULL) - sk_SSL_CIPHER_free(s->session->ciphers); - s->session->ciphers=ciphers; - if (ciphers == NULL) - { - al=SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED); - goto f_err; - } - ciphers=NULL; - c=ssl3_choose_cipher(s,s->session->ciphers, - SSL_get_ciphers(s)); - - if (c == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER); - goto f_err; - } - s->s3->tmp.new_cipher=c; - } - else - { - /* Session-id reuse */ -#ifdef REUSE_CIPHER_BUG - STACK_OF(SSL_CIPHER) *sk; - SSL_CIPHER *nc=NULL; - SSL_CIPHER *ec=NULL; - - if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG) - { - sk=s->session->ciphers; - for (i=0; i<sk_SSL_CIPHER_num(sk); i++) - { - c=sk_SSL_CIPHER_value(sk,i); - if (c->algorithm_enc & SSL_eNULL) - nc=c; - if (SSL_C_IS_EXPORT(c)) - ec=c; - } - if (nc != NULL) - s->s3->tmp.new_cipher=nc; - else if (ec != NULL) - s->s3->tmp.new_cipher=ec; - else - s->s3->tmp.new_cipher=s->session->cipher; - } - else -#endif - s->s3->tmp.new_cipher=s->session->cipher; - } - - if (!ssl3_digest_cached_records(s)) - goto f_err; - - /* we now have the following setup. - * client_random - * cipher_list - our prefered list of ciphers - * ciphers - the clients prefered list of ciphers - * compression - basically ignored right now - * ssl version is set - sslv3 - * s->session - The ssl session has been setup. - * s->hit - session reuse flag - * s->tmp.new_cipher - the new cipher to use. - */ - - if (ret < 0) ret=1; - if (0) - { -f_err: - ssl3_send_alert(s,SSL3_AL_FATAL,al); - } -err: - if (ciphers != NULL) sk_SSL_CIPHER_free(ciphers); - return(ret); - } - -int ssl3_send_server_hello(SSL *s) - { - unsigned char *buf; - unsigned char *p,*d; - int i,sl; - unsigned long l; -#ifdef OPENSSL_NO_TLSEXT - unsigned long Time; -#endif - - if (s->state == SSL3_ST_SW_SRVR_HELLO_A) - { - buf=(unsigned char *)s->init_buf->data; -#ifdef OPENSSL_NO_TLSEXT - p=s->s3->server_random; - /* Generate server_random if it was not needed previously */ - Time=(unsigned long)time(NULL); /* Time */ - l2n(Time,p); - if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) - return -1; -#endif - /* Do the message type and length last */ - d=p= &(buf[4]); - - *(p++)=s->version>>8; - *(p++)=s->version&0xff; - - /* Random stuff */ - memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE); - p+=SSL3_RANDOM_SIZE; - - /* now in theory we have 3 options to sending back the - * session id. If it is a re-use, we send back the - * old session-id, if it is a new session, we send - * back the new session-id or we send back a 0 length - * session-id if we want it to be single use. - * Currently I will not implement the '0' length session-id - * 12-Jan-98 - I'll now support the '0' length stuff. - * - * We also have an additional case where stateless session - * resumption is successful: we always send back the old - * session id. In this case s->hit is non zero: this can - * only happen if stateless session resumption is succesful - * if session caching is disabled so existing functionality - * is unaffected. - */ - if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) - && !s->hit) - s->session->session_id_length=0; - - sl=s->session->session_id_length; - if (sl > (int)sizeof(s->session->session_id)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); - return -1; - } - *(p++)=sl; - memcpy(p,s->session->session_id,sl); - p+=sl; - - /* put the cipher */ - i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p); - p+=i; - - /* put the compression method */ -#ifdef OPENSSL_NO_COMP - *(p++)=0; -#else - if (s->s3->tmp.new_compression == NULL) - *(p++)=0; - else - *(p++)=s->s3->tmp.new_compression->id; -#endif -#ifndef OPENSSL_NO_TLSEXT - if (ssl_prepare_serverhello_tlsext(s) <= 0) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT); - return -1; - } - if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR); - return -1; - } -#endif - /* do the header */ - l=(p-d); - d=buf; - *(d++)=SSL3_MT_SERVER_HELLO; - l2n3(l,d); - - s->state=SSL3_ST_SW_SRVR_HELLO_B; - /* number of bytes to write */ - s->init_num=p-buf; - s->init_off=0; - } - - /* SSL3_ST_SW_SRVR_HELLO_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } - -int ssl3_send_server_done(SSL *s) - { - unsigned char *p; - - if (s->state == SSL3_ST_SW_SRVR_DONE_A) - { - p=(unsigned char *)s->init_buf->data; - - /* do the header */ - *(p++)=SSL3_MT_SERVER_DONE; - *(p++)=0; - *(p++)=0; - *(p++)=0; - - s->state=SSL3_ST_SW_SRVR_DONE_B; - /* number of bytes to write */ - s->init_num=4; - s->init_off=0; - } - - /* SSL3_ST_SW_SRVR_DONE_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } - -int ssl3_send_server_key_exchange(SSL *s) - { -#ifndef OPENSSL_NO_RSA - unsigned char *q; - int j,num; - RSA *rsa; - unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH]; - unsigned int u; -#endif -#ifndef OPENSSL_NO_DH - DH *dh=NULL,*dhp; -#endif -#ifndef OPENSSL_NO_ECDH - EC_KEY *ecdh=NULL, *ecdhp; - unsigned char *encodedPoint = NULL; - int encodedlen = 0; - int curve_id = 0; - BN_CTX *bn_ctx = NULL; -#endif - EVP_PKEY *pkey; - unsigned char *p,*d; - int al,i; - unsigned long type; - int n; - CERT *cert; - BIGNUM *r[4]; - int nr[4],kn; - BUF_MEM *buf; - EVP_MD_CTX md_ctx; - - EVP_MD_CTX_init(&md_ctx); - if (s->state == SSL3_ST_SW_KEY_EXCH_A) - { - type=s->s3->tmp.new_cipher->algorithm_mkey; - cert=s->cert; - - buf=s->init_buf; - - r[0]=r[1]=r[2]=r[3]=NULL; - n=0; -#ifndef OPENSSL_NO_RSA - if (type & SSL_kRSA) - { - rsa=cert->rsa_tmp; - if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL)) - { - rsa=s->cert->rsa_tmp_cb(s, - SSL_C_IS_EXPORT(s->s3->tmp.new_cipher), - SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)); - if(rsa == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY); - goto f_err; - } - RSA_up_ref(rsa); - cert->rsa_tmp=rsa; - } - if (rsa == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY); - goto f_err; - } - r[0]=rsa->n; - r[1]=rsa->e; - s->s3->tmp.use_rsa_tmp=1; - } - else -#endif -#ifndef OPENSSL_NO_DH - if (type & SSL_kEDH) - { - dhp=cert->dh_tmp; - if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL)) - dhp=s->cert->dh_tmp_cb(s, - SSL_C_IS_EXPORT(s->s3->tmp.new_cipher), - SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)); - if (dhp == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY); - goto f_err; - } - - if (s->s3->tmp.dh != NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR); - goto err; - } - - if ((dh=DHparams_dup(dhp)) == NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); - goto err; - } - - s->s3->tmp.dh=dh; - if ((dhp->pub_key == NULL || - dhp->priv_key == NULL || - (s->options & SSL_OP_SINGLE_DH_USE))) - { - if(!DH_generate_key(dh)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, - ERR_R_DH_LIB); - goto err; - } - } - else - { - dh->pub_key=BN_dup(dhp->pub_key); - dh->priv_key=BN_dup(dhp->priv_key); - if ((dh->pub_key == NULL) || - (dh->priv_key == NULL)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); - goto err; - } - } - r[0]=dh->p; - r[1]=dh->g; - r[2]=dh->pub_key; - } - else -#endif -#ifndef OPENSSL_NO_ECDH - if (type & SSL_kEECDH) - { - const EC_GROUP *group; - - ecdhp=cert->ecdh_tmp; - if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL)) - { - ecdhp=s->cert->ecdh_tmp_cb(s, - SSL_C_IS_EXPORT(s->s3->tmp.new_cipher), - SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)); - } - if (ecdhp == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY); - goto f_err; - } - - if (s->s3->tmp.ecdh != NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR); - goto err; - } - - /* Duplicate the ECDH structure. */ - if (ecdhp == NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB); - goto err; - } - if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB); - goto err; - } - - s->s3->tmp.ecdh=ecdh; - if ((EC_KEY_get0_public_key(ecdh) == NULL) || - (EC_KEY_get0_private_key(ecdh) == NULL) || - (s->options & SSL_OP_SINGLE_ECDH_USE)) - { - if(!EC_KEY_generate_key(ecdh)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB); - goto err; - } - } - - if (((group = EC_KEY_get0_group(ecdh)) == NULL) || - (EC_KEY_get0_public_key(ecdh) == NULL) || - (EC_KEY_get0_private_key(ecdh) == NULL)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB); - goto err; - } - - if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && - (EC_GROUP_get_degree(group) > 163)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER); - goto err; - } - - /* XXX: For now, we only support ephemeral ECDH - * keys over named (not generic) curves. For - * supported named curves, curve_id is non-zero. - */ - if ((curve_id = - tls1_ec_nid2curve_id(EC_GROUP_get_curve_name(group))) - == 0) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNSUPPORTED_ELLIPTIC_CURVE); - goto err; - } - - /* Encode the public key. - * First check the size of encoding and - * allocate memory accordingly. - */ - encodedlen = EC_POINT_point2oct(group, - EC_KEY_get0_public_key(ecdh), - POINT_CONVERSION_UNCOMPRESSED, - NULL, 0, NULL); - - encodedPoint = (unsigned char *) - OPENSSL_malloc(encodedlen*sizeof(unsigned char)); - bn_ctx = BN_CTX_new(); - if ((encodedPoint == NULL) || (bn_ctx == NULL)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE); - goto err; - } - - - encodedlen = EC_POINT_point2oct(group, - EC_KEY_get0_public_key(ecdh), - POINT_CONVERSION_UNCOMPRESSED, - encodedPoint, encodedlen, bn_ctx); - - if (encodedlen == 0) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB); - goto err; - } - - BN_CTX_free(bn_ctx); bn_ctx=NULL; - - /* XXX: For now, we only support named (not - * generic) curves in ECDH ephemeral key exchanges. - * In this situation, we need four additional bytes - * to encode the entire ServerECDHParams - * structure. - */ - n = 4 + encodedlen; - - /* We'll generate the serverKeyExchange message - * explicitly so we can set these to NULLs - */ - r[0]=NULL; - r[1]=NULL; - r[2]=NULL; - r[3]=NULL; - } - else -#endif /* !OPENSSL_NO_ECDH */ -#ifndef OPENSSL_NO_PSK - if (type & SSL_kPSK) - { - /* reserve size for record length and PSK identity hint*/ - n+=2+strlen(s->ctx->psk_identity_hint); - } - else -#endif /* !OPENSSL_NO_PSK */ - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE); - goto f_err; - } - for (i=0; r[i] != NULL; i++) - { - nr[i]=BN_num_bytes(r[i]); - n+=2+nr[i]; - } - - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) - && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) - { - if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher)) - == NULL) - { - al=SSL_AD_DECODE_ERROR; - goto f_err; - } - kn=EVP_PKEY_size(pkey); - } - else - { - pkey=NULL; - kn=0; - } - - if (!BUF_MEM_grow_clean(buf,n+4+kn)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF); - goto err; - } - d=(unsigned char *)s->init_buf->data; - p= &(d[4]); - - for (i=0; r[i] != NULL; i++) - { - s2n(nr[i],p); - BN_bn2bin(r[i],p); - p+=nr[i]; - } - -#ifndef OPENSSL_NO_ECDH - if (type & SSL_kEECDH) - { - /* XXX: For now, we only support named (not generic) curves. - * In this situation, the serverKeyExchange message has: - * [1 byte CurveType], [2 byte CurveName] - * [1 byte length of encoded point], followed by - * the actual encoded point itself - */ - *p = NAMED_CURVE_TYPE; - p += 1; - *p = 0; - p += 1; - *p = curve_id; - p += 1; - *p = encodedlen; - p += 1; - memcpy((unsigned char*)p, - (unsigned char *)encodedPoint, - encodedlen); - OPENSSL_free(encodedPoint); - encodedPoint = NULL; - p += encodedlen; - } -#endif - -#ifndef OPENSSL_NO_PSK - if (type & SSL_kPSK) - { - /* copy PSK identity hint */ - s2n(strlen(s->ctx->psk_identity_hint), p); - strncpy((char *)p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint)); - p+=strlen(s->ctx->psk_identity_hint); - } -#endif - - /* not anonymous */ - if (pkey != NULL) - { - /* n is the length of the params, they start at &(d[4]) - * and p points to the space at the end. */ -#ifndef OPENSSL_NO_RSA - if (pkey->type == EVP_PKEY_RSA) - { - q=md_buf; - j=0; - for (num=2; num > 0; num--) - { - EVP_DigestInit_ex(&md_ctx,(num == 2) - ?s->ctx->md5:s->ctx->sha1, NULL); - EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); - EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); - EVP_DigestUpdate(&md_ctx,&(d[4]),n); - EVP_DigestFinal_ex(&md_ctx,q, - (unsigned int *)&i); - q+=i; - j+=i; - } - if (RSA_sign(NID_md5_sha1, md_buf, j, - &(p[2]), &u, pkey->pkey.rsa) <= 0) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA); - goto err; - } - s2n(u,p); - n+=u+2; - } - else -#endif -#if !defined(OPENSSL_NO_DSA) - if (pkey->type == EVP_PKEY_DSA) - { - /* lets do DSS */ - EVP_SignInit_ex(&md_ctx,EVP_dss1(), NULL); - EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); - EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); - EVP_SignUpdate(&md_ctx,&(d[4]),n); - if (!EVP_SignFinal(&md_ctx,&(p[2]), - (unsigned int *)&i,pkey)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA); - goto err; - } - s2n(i,p); - n+=i+2; - } - else -#endif -#if !defined(OPENSSL_NO_ECDSA) - if (pkey->type == EVP_PKEY_EC) - { - /* let's do ECDSA */ - EVP_SignInit_ex(&md_ctx,EVP_ecdsa(), NULL); - EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); - EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); - EVP_SignUpdate(&md_ctx,&(d[4]),n); - if (!EVP_SignFinal(&md_ctx,&(p[2]), - (unsigned int *)&i,pkey)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_ECDSA); - goto err; - } - s2n(i,p); - n+=i+2; - } - else -#endif - { - /* Is this error check actually needed? */ - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE); - goto f_err; - } - } - - *(d++)=SSL3_MT_SERVER_KEY_EXCHANGE; - l2n3(n,d); - - /* we should now have things packed up, so lets send - * it off */ - s->init_num=n+4; - s->init_off=0; - } - - s->state = SSL3_ST_SW_KEY_EXCH_B; - EVP_MD_CTX_cleanup(&md_ctx); - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); -f_err: - ssl3_send_alert(s,SSL3_AL_FATAL,al); -err: -#ifndef OPENSSL_NO_ECDH - if (encodedPoint != NULL) OPENSSL_free(encodedPoint); - BN_CTX_free(bn_ctx); -#endif - EVP_MD_CTX_cleanup(&md_ctx); - return(-1); - } - -int ssl3_send_certificate_request(SSL *s) - { - unsigned char *p,*d; - int i,j,nl,off,n; - STACK_OF(X509_NAME) *sk=NULL; - X509_NAME *name; - BUF_MEM *buf; - - if (s->state == SSL3_ST_SW_CERT_REQ_A) - { - buf=s->init_buf; - - d=p=(unsigned char *)&(buf->data[4]); - - /* get the list of acceptable cert types */ - p++; - n=ssl3_get_req_cert_type(s,p); - d[0]=n; - p+=n; - n++; - - off=n; - p+=2; - n+=2; - - sk=SSL_get_client_CA_list(s); - nl=0; - if (sk != NULL) - { - for (i=0; i<sk_X509_NAME_num(sk); i++) - { - name=sk_X509_NAME_value(sk,i); - j=i2d_X509_NAME(name,NULL); - if (!BUF_MEM_grow_clean(buf,4+n+j+2)) - { - SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB); - goto err; - } - p=(unsigned char *)&(buf->data[4+n]); - if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) - { - s2n(j,p); - i2d_X509_NAME(name,&p); - n+=2+j; - nl+=2+j; - } - else - { - d=p; - i2d_X509_NAME(name,&p); - j-=2; s2n(j,d); j+=2; - n+=j; - nl+=j; - } - } - } - /* else no CA names */ - p=(unsigned char *)&(buf->data[4+off]); - s2n(nl,p); - - d=(unsigned char *)buf->data; - *(d++)=SSL3_MT_CERTIFICATE_REQUEST; - l2n3(n,d); - - /* we should now have things packed up, so lets send - * it off */ - - s->init_num=n+4; - s->init_off=0; -#ifdef NETSCAPE_HANG_BUG - p=(unsigned char *)s->init_buf->data + s->init_num; - - /* do the header */ - *(p++)=SSL3_MT_SERVER_DONE; - *(p++)=0; - *(p++)=0; - *(p++)=0; - s->init_num += 4; -#endif - - s->state = SSL3_ST_SW_CERT_REQ_B; - } - - /* SSL3_ST_SW_CERT_REQ_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); -err: - return(-1); - } - -int ssl3_get_client_key_exchange(SSL *s) - { - int i,al,ok; - long n; - unsigned long alg_k; - unsigned char *p; -#ifndef OPENSSL_NO_RSA - RSA *rsa=NULL; - EVP_PKEY *pkey=NULL; -#endif -#ifndef OPENSSL_NO_DH - BIGNUM *pub=NULL; - DH *dh_srvr; -#endif -#ifndef OPENSSL_NO_KRB5 - KSSL_ERR kssl_err; -#endif /* OPENSSL_NO_KRB5 */ - -#ifndef OPENSSL_NO_ECDH - EC_KEY *srvr_ecdh = NULL; - EVP_PKEY *clnt_pub_pkey = NULL; - EC_POINT *clnt_ecpoint = NULL; - BN_CTX *bn_ctx = NULL; -#endif - - n=s->method->ssl_get_message(s, - SSL3_ST_SR_KEY_EXCH_A, - SSL3_ST_SR_KEY_EXCH_B, - SSL3_MT_CLIENT_KEY_EXCHANGE, - 2048, /* ??? */ - &ok); - - if (!ok) return((int)n); - p=(unsigned char *)s->init_msg; - - alg_k=s->s3->tmp.new_cipher->algorithm_mkey; - -#ifndef OPENSSL_NO_RSA - if (alg_k & SSL_kRSA) - { - /* FIX THIS UP EAY EAY EAY EAY */ - if (s->s3->tmp.use_rsa_tmp) - { - if ((s->cert != NULL) && (s->cert->rsa_tmp != NULL)) - rsa=s->cert->rsa_tmp; - /* Don't do a callback because rsa_tmp should - * be sent already */ - if (rsa == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_PKEY); - goto f_err; - - } - } - else - { - pkey=s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey; - if ( (pkey == NULL) || - (pkey->type != EVP_PKEY_RSA) || - (pkey->pkey.rsa == NULL)) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_RSA_CERTIFICATE); - goto f_err; - } - rsa=pkey->pkey.rsa; - } - - /* TLS and [incidentally] DTLS{0xFEFF} */ - if (s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER) - { - n2s(p,i); - if (n != i+2) - { - if (!(s->options & SSL_OP_TLS_D5_BUG)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG); - goto err; - } - else - p-=2; - } - else - n=i; - } - - i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING); - - al = -1; - - if (i != SSL_MAX_MASTER_KEY_LENGTH) - { - al=SSL_AD_DECODE_ERROR; - /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT); */ - } - - if ((al == -1) && !((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff)))) - { - /* The premaster secret must contain the same version number as the - * ClientHello to detect version rollback attacks (strangely, the - * protocol does not offer such protection for DH ciphersuites). - * However, buggy clients exist that send the negotiated protocol - * version instead if the server does not support the requested - * protocol version. - * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */ - if (!((s->options & SSL_OP_TLS_ROLLBACK_BUG) && - (p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff)))) - { - al=SSL_AD_DECODE_ERROR; - /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); */ - - /* The Klima-Pokorny-Rosa extension of Bleichenbacher's attack - * (http://eprint.iacr.org/2003/052/) exploits the version - * number check as a "bad version oracle" -- an alert would - * reveal that the plaintext corresponding to some ciphertext - * made up by the adversary is properly formatted except - * that the version number is wrong. To avoid such attacks, - * we should treat this just like any other decryption error. */ - } - } - - if (al != -1) - { - /* Some decryption failure -- use random value instead as countermeasure - * against Bleichenbacher's attack on PKCS #1 v1.5 RSA padding - * (see RFC 2246, section 7.4.7.1). */ - ERR_clear_error(); - i = SSL_MAX_MASTER_KEY_LENGTH; - p[0] = s->client_version >> 8; - p[1] = s->client_version & 0xff; - if (RAND_pseudo_bytes(p+2, i-2) <= 0) /* should be RAND_bytes, but we cannot work around a failure */ - goto err; - } - - s->session->master_key_length= - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key, - p,i); - OPENSSL_cleanse(p,i); - } - else -#endif -#ifndef OPENSSL_NO_DH - if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) - { - n2s(p,i); - if (n != i+2) - { - if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG); - goto err; - } - else - { - p-=2; - i=(int)n; - } - } - - if (n == 0L) /* the parameters are in the cert */ - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_DECODE_DH_CERTS); - goto f_err; - } - else - { - if (s->s3->tmp.dh == NULL) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY); - goto f_err; - } - else - dh_srvr=s->s3->tmp.dh; - } - - pub=BN_bin2bn(p,i,NULL); - if (pub == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BN_LIB); - goto err; - } - - i=DH_compute_key(p,pub,dh_srvr); - - if (i <= 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB); - goto err; - } - - DH_free(s->s3->tmp.dh); - s->s3->tmp.dh=NULL; - - BN_clear_free(pub); - pub=NULL; - s->session->master_key_length= - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key,p,i); - OPENSSL_cleanse(p,i); - } - else -#endif -#ifndef OPENSSL_NO_KRB5 - if (alg_k & SSL_kKRB5) - { - krb5_error_code krb5rc; - krb5_data enc_ticket; - krb5_data authenticator; - krb5_data enc_pms; - KSSL_CTX *kssl_ctx = s->kssl_ctx; - EVP_CIPHER_CTX ciph_ctx; - const EVP_CIPHER *enc = NULL; - unsigned char iv[EVP_MAX_IV_LENGTH]; - unsigned char pms[SSL_MAX_MASTER_KEY_LENGTH - + EVP_MAX_BLOCK_LENGTH]; - int padl, outl; - krb5_timestamp authtime = 0; - krb5_ticket_times ttimes; - - EVP_CIPHER_CTX_init(&ciph_ctx); - - if (!kssl_ctx) kssl_ctx = kssl_ctx_new(); - - n2s(p,i); - enc_ticket.length = i; - - if (n < (long)(enc_ticket.length + 6)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - - enc_ticket.data = (char *)p; - p+=enc_ticket.length; - - n2s(p,i); - authenticator.length = i; - - if (n < (long)(enc_ticket.length + authenticator.length + 6)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - - authenticator.data = (char *)p; - p+=authenticator.length; - - n2s(p,i); - enc_pms.length = i; - enc_pms.data = (char *)p; - p+=enc_pms.length; - - /* Note that the length is checked again below, - ** after decryption - */ - if(enc_pms.length > sizeof pms) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - - if (n != (long)(enc_ticket.length + authenticator.length + - enc_pms.length + 6)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - - if ((krb5rc = kssl_sget_tkt(kssl_ctx, &enc_ticket, &ttimes, - &kssl_err)) != 0) - { -#ifdef KSSL_DEBUG - printf("kssl_sget_tkt rtn %d [%d]\n", - krb5rc, kssl_err.reason); - if (kssl_err.text) - printf("kssl_err text= %s\n", kssl_err.text); -#endif /* KSSL_DEBUG */ - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - kssl_err.reason); - goto err; - } - - /* Note: no authenticator is not considered an error, - ** but will return authtime == 0. - */ - if ((krb5rc = kssl_check_authent(kssl_ctx, &authenticator, - &authtime, &kssl_err)) != 0) - { -#ifdef KSSL_DEBUG - printf("kssl_check_authent rtn %d [%d]\n", - krb5rc, kssl_err.reason); - if (kssl_err.text) - printf("kssl_err text= %s\n", kssl_err.text); -#endif /* KSSL_DEBUG */ - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - kssl_err.reason); - goto err; - } - - if ((krb5rc = kssl_validate_times(authtime, &ttimes)) != 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, krb5rc); - goto err; - } - -#ifdef KSSL_DEBUG - kssl_ctx_show(kssl_ctx); -#endif /* KSSL_DEBUG */ - - enc = kssl_map_enc(kssl_ctx->enctype); - if (enc == NULL) - goto err; - - memset(iv, 0, sizeof iv); /* per RFC 1510 */ - - if (!EVP_DecryptInit_ex(&ciph_ctx,enc,NULL,kssl_ctx->key,iv)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DECRYPTION_FAILED); - goto err; - } - if (!EVP_DecryptUpdate(&ciph_ctx, pms,&outl, - (unsigned char *)enc_pms.data, enc_pms.length)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DECRYPTION_FAILED); - goto err; - } - if (outl > SSL_MAX_MASTER_KEY_LENGTH) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - if (!EVP_DecryptFinal_ex(&ciph_ctx,&(pms[outl]),&padl)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DECRYPTION_FAILED); - goto err; - } - outl += padl; - if (outl > SSL_MAX_MASTER_KEY_LENGTH) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto err; - } - if (!((pms[0] == (s->client_version>>8)) && (pms[1] == (s->client_version & 0xff)))) - { - /* The premaster secret must contain the same version number as the - * ClientHello to detect version rollback attacks (strangely, the - * protocol does not offer such protection for DH ciphersuites). - * However, buggy clients exist that send random bytes instead of - * the protocol version. - * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. - * (Perhaps we should have a separate BUG value for the Kerberos cipher) - */ - if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_AD_DECODE_ERROR); - goto err; - } - } - - EVP_CIPHER_CTX_cleanup(&ciph_ctx); - - s->session->master_key_length= - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key, pms, outl); - - if (kssl_ctx->client_princ) - { - size_t len = strlen(kssl_ctx->client_princ); - if ( len < SSL_MAX_KRB5_PRINCIPAL_LENGTH ) - { - s->session->krb5_client_princ_len = len; - memcpy(s->session->krb5_client_princ,kssl_ctx->client_princ,len); - } - } - - - /* Was doing kssl_ctx_free() here, - ** but it caused problems for apache. - ** kssl_ctx = kssl_ctx_free(kssl_ctx); - ** if (s->kssl_ctx) s->kssl_ctx = NULL; - */ - } - else -#endif /* OPENSSL_NO_KRB5 */ - -#ifndef OPENSSL_NO_ECDH - if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) - { - int ret = 1; - int field_size = 0; - const EC_KEY *tkey; - const EC_GROUP *group; - const BIGNUM *priv_key; - - /* initialize structures for server's ECDH key pair */ - if ((srvr_ecdh = EC_KEY_new()) == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_MALLOC_FAILURE); - goto err; - } - - /* Let's get server private key and group information */ - if (alg_k & (SSL_kECDHr|SSL_kECDHe)) - { - /* use the certificate */ - tkey = s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec; - } - else - { - /* use the ephermeral values we saved when - * generating the ServerKeyExchange msg. - */ - tkey = s->s3->tmp.ecdh; - } - - group = EC_KEY_get0_group(tkey); - priv_key = EC_KEY_get0_private_key(tkey); - - if (!EC_KEY_set_group(srvr_ecdh, group) || - !EC_KEY_set_private_key(srvr_ecdh, priv_key)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_EC_LIB); - goto err; - } - - /* Let's get client's public key */ - if ((clnt_ecpoint = EC_POINT_new(group)) == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_MALLOC_FAILURE); - goto err; - } - - if (n == 0L) - { - /* Client Publickey was in Client Certificate */ - - if (alg_k & SSL_kEECDH) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY); - goto f_err; - } - if (((clnt_pub_pkey=X509_get_pubkey(s->session->peer)) - == NULL) || - (clnt_pub_pkey->type != EVP_PKEY_EC)) - { - /* XXX: For now, we do not support client - * authentication using ECDH certificates - * so this branch (n == 0L) of the code is - * never executed. When that support is - * added, we ought to ensure the key - * received in the certificate is - * authorized for key agreement. - * ECDH_compute_key implicitly checks that - * the two ECDH shares are for the same - * group. - */ - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_UNABLE_TO_DECODE_ECDH_CERTS); - goto f_err; - } - - if (EC_POINT_copy(clnt_ecpoint, - EC_KEY_get0_public_key(clnt_pub_pkey->pkey.ec)) == 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_EC_LIB); - goto err; - } - ret = 2; /* Skip certificate verify processing */ - } - else - { - /* Get client's public key from encoded point - * in the ClientKeyExchange message. - */ - if ((bn_ctx = BN_CTX_new()) == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_MALLOC_FAILURE); - goto err; - } - - /* Get encoded point length */ - i = *p; - p += 1; - if (n != 1 + i) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_EC_LIB); - goto err; - } - if (EC_POINT_oct2point(group, - clnt_ecpoint, p, i, bn_ctx) == 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_EC_LIB); - goto err; - } - /* p is pointing to somewhere in the buffer - * currently, so set it to the start - */ - p=(unsigned char *)s->init_buf->data; - } - - /* Compute the shared pre-master secret */ - field_size = EC_GROUP_get_degree(group); - if (field_size <= 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_ECDH_LIB); - goto err; - } - i = ECDH_compute_key(p, (field_size+7)/8, clnt_ecpoint, srvr_ecdh, NULL); - if (i <= 0) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_ECDH_LIB); - goto err; - } - - EVP_PKEY_free(clnt_pub_pkey); - EC_POINT_free(clnt_ecpoint); - EC_KEY_free(srvr_ecdh); - BN_CTX_free(bn_ctx); - EC_KEY_free(s->s3->tmp.ecdh); - s->s3->tmp.ecdh = NULL; - - /* Compute the master secret */ - s->session->master_key_length = s->method->ssl3_enc-> \ - generate_master_secret(s, s->session->master_key, p, i); - - OPENSSL_cleanse(p, i); - return (ret); - } - else -#endif -#ifndef OPENSSL_NO_PSK - if (alg_k & SSL_kPSK) - { - unsigned char *t = NULL; - unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4]; - unsigned int pre_ms_len = 0, psk_len = 0; - int psk_err = 1; - char tmp_id[PSK_MAX_IDENTITY_LEN+1]; - - al=SSL_AD_HANDSHAKE_FAILURE; - - n2s(p,i); - if (n != i+2) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_LENGTH_MISMATCH); - goto psk_err; - } - if (i > PSK_MAX_IDENTITY_LEN) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_DATA_LENGTH_TOO_LONG); - goto psk_err; - } - if (s->psk_server_callback == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_PSK_NO_SERVER_CB); - goto psk_err; - } - - /* Create guaranteed NULL-terminated identity - * string for the callback */ - memcpy(tmp_id, p, i); - memset(tmp_id+i, 0, PSK_MAX_IDENTITY_LEN+1-i); - psk_len = s->psk_server_callback(s, tmp_id, - psk_or_pre_ms, sizeof(psk_or_pre_ms)); - OPENSSL_cleanse(tmp_id, PSK_MAX_IDENTITY_LEN+1); - - if (psk_len > PSK_MAX_PSK_LEN) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_INTERNAL_ERROR); - goto psk_err; - } - else if (psk_len == 0) - { - /* PSK related to the given identity not found */ - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_PSK_IDENTITY_NOT_FOUND); - al=SSL_AD_UNKNOWN_PSK_IDENTITY; - goto psk_err; - } - - /* create PSK pre_master_secret */ - pre_ms_len=2+psk_len+2+psk_len; - t = psk_or_pre_ms; - memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len); - s2n(psk_len, t); - memset(t, 0, psk_len); - t+=psk_len; - s2n(psk_len, t); - - if (s->session->psk_identity != NULL) - OPENSSL_free(s->session->psk_identity); - s->session->psk_identity = BUF_strdup((char *)p); - if (s->session->psk_identity == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_MALLOC_FAILURE); - goto psk_err; - } - - if (s->session->psk_identity_hint != NULL) - OPENSSL_free(s->session->psk_identity_hint); - s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint); - if (s->ctx->psk_identity_hint != NULL && - s->session->psk_identity_hint == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - ERR_R_MALLOC_FAILURE); - goto psk_err; - } - - s->session->master_key_length= - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key, psk_or_pre_ms, pre_ms_len); - psk_err = 0; - psk_err: - OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms)); - if (psk_err != 0) - goto f_err; - } - else -#endif - if (alg_k & SSL_kGOST) - { - int ret = 0; - EVP_PKEY_CTX *pkey_ctx; - EVP_PKEY *client_pub_pkey = NULL, *pk = NULL; - unsigned char premaster_secret[32], *start; - size_t outlen=32, inlen; - unsigned long alg_a; - - /* Get our certificate private key*/ - alg_a = s->s3->tmp.new_cipher->algorithm_auth; - if (alg_a & SSL_aGOST94) - pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey; - else if (alg_a & SSL_aGOST01) - pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey; - - pkey_ctx = EVP_PKEY_CTX_new(pk,NULL); - EVP_PKEY_decrypt_init(pkey_ctx); - /* If client certificate is present and is of the same type, maybe - * use it for key exchange. Don't mind errors from - * EVP_PKEY_derive_set_peer, because it is completely valid to use - * a client certificate for authorization only. */ - client_pub_pkey = X509_get_pubkey(s->session->peer); - if (client_pub_pkey) - { - if (EVP_PKEY_derive_set_peer(pkey_ctx, client_pub_pkey) <= 0) - ERR_clear_error(); - } - /* Decrypt session key */ - if ((*p!=( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED); - goto gerr; - } - if (p[1] == 0x81) - { - start = p+3; - inlen = p[2]; - } - else if (p[1] < 0x80) - { - start = p+2; - inlen = p[1]; - } - else - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED); - goto gerr; - } - if (EVP_PKEY_decrypt(pkey_ctx,premaster_secret,&outlen,start,inlen) <=0) - - { - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED); - goto gerr; - } - /* Generate master secret */ - s->session->master_key_length= - s->method->ssl3_enc->generate_master_secret(s, - s->session->master_key,premaster_secret,32); - /* Check if pubkey from client certificate was used */ - if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) - ret = 2; - else - ret = 1; - gerr: - EVP_PKEY_free(client_pub_pkey); - EVP_PKEY_CTX_free(pkey_ctx); - if (ret) - return ret; - else - goto err; - } - else - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, - SSL_R_UNKNOWN_CIPHER_TYPE); - goto f_err; - } - - return(1); -f_err: - ssl3_send_alert(s,SSL3_AL_FATAL,al); -#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) -err: -#endif -#ifndef OPENSSL_NO_ECDH - EVP_PKEY_free(clnt_pub_pkey); - EC_POINT_free(clnt_ecpoint); - if (srvr_ecdh != NULL) - EC_KEY_free(srvr_ecdh); - BN_CTX_free(bn_ctx); -#endif - return(-1); - } - -int ssl3_get_cert_verify(SSL *s) - { - EVP_PKEY *pkey=NULL; - unsigned char *p; - int al,ok,ret=0; - long n; - int type=0,i,j; - X509 *peer; - - n=s->method->ssl_get_message(s, - SSL3_ST_SR_CERT_VRFY_A, - SSL3_ST_SR_CERT_VRFY_B, - -1, - 514, /* 514? */ - &ok); - - if (!ok) return((int)n); - - if (s->session->peer != NULL) - { - peer=s->session->peer; - pkey=X509_get_pubkey(peer); - type=X509_certificate_type(peer,pkey); - } - else - { - peer=NULL; - pkey=NULL; - } - - if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY) - { - s->s3->tmp.reuse_message=1; - if ((peer != NULL) && (type | EVP_PKT_SIGN)) - { - al=SSL_AD_UNEXPECTED_MESSAGE; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE); - goto f_err; - } - ret=1; - goto end; - } - - if (peer == NULL) - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_NO_CLIENT_CERT_RECEIVED); - al=SSL_AD_UNEXPECTED_MESSAGE; - goto f_err; - } - - if (!(type & EVP_PKT_SIGN)) - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE); - al=SSL_AD_ILLEGAL_PARAMETER; - goto f_err; - } - - if (s->s3->change_cipher_spec) - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY); - al=SSL_AD_UNEXPECTED_MESSAGE; - goto f_err; - } - - /* we now have a signature that we need to verify */ - p=(unsigned char *)s->init_msg; - /* Check for broken implementations of GOST ciphersuites */ - /* If key is GOST and n is exactly 64, it is bare - * signature without length field */ - if (n==64 && (pkey->type==NID_id_GostR3410_94 || - pkey->type == NID_id_GostR3410_2001) ) - { - i=64; - } - else - { - n2s(p,i); - n-=2; - if (i > n) - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_LENGTH_MISMATCH); - al=SSL_AD_DECODE_ERROR; - goto f_err; - } - } - j=EVP_PKEY_size(pkey); - if ((i > j) || (n > j) || (n <= 0)) - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_SIZE); - al=SSL_AD_DECODE_ERROR; - goto f_err; - } - -#ifndef OPENSSL_NO_RSA - if (pkey->type == EVP_PKEY_RSA) - { - i=RSA_verify(NID_md5_sha1, s->s3->tmp.cert_verify_md, - MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH, p, i, - pkey->pkey.rsa); - if (i < 0) - { - al=SSL_AD_DECRYPT_ERROR; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_DECRYPT); - goto f_err; - } - if (i == 0) - { - al=SSL_AD_DECRYPT_ERROR; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_SIGNATURE); - goto f_err; - } - } - else -#endif -#ifndef OPENSSL_NO_DSA - if (pkey->type == EVP_PKEY_DSA) - { - j=DSA_verify(pkey->save_type, - &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]), - SHA_DIGEST_LENGTH,p,i,pkey->pkey.dsa); - if (j <= 0) - { - /* bad signature */ - al=SSL_AD_DECRYPT_ERROR; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_DSA_SIGNATURE); - goto f_err; - } - } - else -#endif -#ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_EC) - { - j=ECDSA_verify(pkey->save_type, - &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]), - SHA_DIGEST_LENGTH,p,i,pkey->pkey.ec); - if (j <= 0) - { - /* bad signature */ - al=SSL_AD_DECRYPT_ERROR; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, - SSL_R_BAD_ECDSA_SIGNATURE); - goto f_err; - } - } - else -#endif - if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) - { unsigned char signature[64]; - int idx; - EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey,NULL); - EVP_PKEY_verify_init(pctx); - if (i!=64) { - fprintf(stderr,"GOST signature length is %d",i); - } - for (idx=0;idx<64;idx++) { - signature[63-idx]=p[idx]; - } - j=EVP_PKEY_verify(pctx,signature,64,s->s3->tmp.cert_verify_md,32); - EVP_PKEY_CTX_free(pctx); - if (j<=0) - { - al=SSL_AD_DECRYPT_ERROR; - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, - SSL_R_BAD_ECDSA_SIGNATURE); - goto f_err; - } - } - else - { - SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR); - al=SSL_AD_UNSUPPORTED_CERTIFICATE; - goto f_err; - } - - - ret=1; - if (0) - { -f_err: - ssl3_send_alert(s,SSL3_AL_FATAL,al); - } -end: - EVP_PKEY_free(pkey); - return(ret); - } - -int ssl3_get_client_certificate(SSL *s) - { - int i,ok,al,ret= -1; - X509 *x=NULL; - unsigned long l,nc,llen,n; - const unsigned char *p,*q; - unsigned char *d; - STACK_OF(X509) *sk=NULL; - - n=s->method->ssl_get_message(s, - SSL3_ST_SR_CERT_A, - SSL3_ST_SR_CERT_B, - -1, - s->max_cert_list, - &ok); - - if (!ok) return((int)n); - - if (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) - { - if ( (s->verify_mode & SSL_VERIFY_PEER) && - (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE); - al=SSL_AD_HANDSHAKE_FAILURE; - goto f_err; - } - /* If tls asked for a client cert, the client must return a 0 list */ - if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST); - al=SSL_AD_UNEXPECTED_MESSAGE; - goto f_err; - } - s->s3->tmp.reuse_message=1; - return(1); - } - - if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE) - { - al=SSL_AD_UNEXPECTED_MESSAGE; - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_WRONG_MESSAGE_TYPE); - goto f_err; - } - p=d=(unsigned char *)s->init_msg; - - if ((sk=sk_X509_new_null()) == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE); - goto err; - } - - n2l3(p,llen); - if (llen+3 != n) - { - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_LENGTH_MISMATCH); - goto f_err; - } - for (nc=0; nc<llen; ) - { - n2l3(p,l); - if ((l+nc+3) > llen) - { - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH); - goto f_err; - } - - q=p; - x=d2i_X509(NULL,&p,l); - if (x == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_ASN1_LIB); - goto err; - } - if (p != (q+l)) - { - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH); - goto f_err; - } - if (!sk_X509_push(sk,x)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE); - goto err; - } - x=NULL; - nc+=l+3; - } - - if (sk_X509_num(sk) <= 0) - { - /* TLS does not mind 0 certs returned */ - if (s->version == SSL3_VERSION) - { - al=SSL_AD_HANDSHAKE_FAILURE; - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATES_RETURNED); - goto f_err; - } - /* Fail for TLS only if we required a certificate */ - else if ((s->verify_mode & SSL_VERIFY_PEER) && - (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE); - al=SSL_AD_HANDSHAKE_FAILURE; - goto f_err; - } - } - else - { - i=ssl_verify_cert_chain(s,sk); - if (i <= 0) - { - al=ssl_verify_alarm_type(s->verify_result); - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED); - goto f_err; - } - } - - if (s->session->peer != NULL) /* This should not be needed */ - X509_free(s->session->peer); - s->session->peer=sk_X509_shift(sk); - s->session->verify_result = s->verify_result; - - /* With the current implementation, sess_cert will always be NULL - * when we arrive here. */ - if (s->session->sess_cert == NULL) - { - s->session->sess_cert = ssl_sess_cert_new(); - if (s->session->sess_cert == NULL) - { - SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE); - goto err; - } - } - if (s->session->sess_cert->cert_chain != NULL) - sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); - s->session->sess_cert->cert_chain=sk; - /* Inconsistency alert: cert_chain does *not* include the - * peer's own certificate, while we do include it in s3_clnt.c */ - - sk=NULL; - - ret=1; - if (0) - { -f_err: - ssl3_send_alert(s,SSL3_AL_FATAL,al); - } -err: - if (x != NULL) X509_free(x); - if (sk != NULL) sk_X509_pop_free(sk,X509_free); - return(ret); - } - -int ssl3_send_server_certificate(SSL *s) - { - unsigned long l; - X509 *x; - - if (s->state == SSL3_ST_SW_CERT_A) - { - x=ssl_get_server_send_cert(s); - if (x == NULL) - { - /* VRS: allow null cert if auth == KRB5 */ - if ((s->s3->tmp.new_cipher->algorithm_auth != SSL_aKRB5) || - (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR); - return(0); - } - } - - l=ssl3_output_cert_chain(s,x); - s->state=SSL3_ST_SW_CERT_B; - s->init_num=(int)l; - s->init_off=0; - } - - /* SSL3_ST_SW_CERT_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } -#ifndef OPENSSL_NO_TLSEXT -int ssl3_send_newsession_ticket(SSL *s) - { - if (s->state == SSL3_ST_SW_SESSION_TICKET_A) - { - unsigned char *p, *senc, *macstart; - int len, slen; - unsigned int hlen; - EVP_CIPHER_CTX ctx; - HMAC_CTX hctx; - SSL_CTX *tctx = s->initial_ctx; - unsigned char iv[EVP_MAX_IV_LENGTH]; - unsigned char key_name[16]; - - /* get session encoding length */ - slen = i2d_SSL_SESSION(s->session, NULL); - /* Some length values are 16 bits, so forget it if session is - * too long - */ - if (slen > 0xFF00) - return -1; - /* Grow buffer if need be: the length calculation is as - * follows 1 (size of message name) + 3 (message length - * bytes) + 4 (ticket lifetime hint) + 2 (ticket length) + - * 16 (key name) + max_iv_len (iv length) + - * session_length + max_enc_block_size (max encrypted session - * length) + max_md_size (HMAC). - */ - if (!BUF_MEM_grow(s->init_buf, - 26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH + - EVP_MAX_MD_SIZE + slen)) - return -1; - senc = OPENSSL_malloc(slen); - if (!senc) - return -1; - p = senc; - i2d_SSL_SESSION(s->session, &p); - - p=(unsigned char *)s->init_buf->data; - /* do the header */ - *(p++)=SSL3_MT_NEWSESSION_TICKET; - /* Skip message length for now */ - p += 3; - EVP_CIPHER_CTX_init(&ctx); - HMAC_CTX_init(&hctx); - /* Initialize HMAC and cipher contexts. If callback present - * it does all the work otherwise use generated values - * from parent ctx. - */ - if (tctx->tlsext_ticket_key_cb) - { - if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, - &hctx, 1) < 0) - { - OPENSSL_free(senc); - return -1; - } - } - else - { - RAND_pseudo_bytes(iv, 16); - EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, - tctx->tlsext_tick_aes_key, iv); - HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16, - tlsext_tick_md(), NULL); - memcpy(key_name, tctx->tlsext_tick_key_name, 16); - } - l2n(s->session->tlsext_tick_lifetime_hint, p); - /* Skip ticket length for now */ - p += 2; - /* Output key name */ - macstart = p; - memcpy(p, key_name, 16); - p += 16; - /* output IV */ - memcpy(p, iv, EVP_CIPHER_CTX_iv_length(&ctx)); - p += EVP_CIPHER_CTX_iv_length(&ctx); - /* Encrypt session data */ - EVP_EncryptUpdate(&ctx, p, &len, senc, slen); - p += len; - EVP_EncryptFinal(&ctx, p, &len); - p += len; - EVP_CIPHER_CTX_cleanup(&ctx); - - HMAC_Update(&hctx, macstart, p - macstart); - HMAC_Final(&hctx, p, &hlen); - HMAC_CTX_cleanup(&hctx); - - p += hlen; - /* Now write out lengths: p points to end of data written */ - /* Total length */ - len = p - (unsigned char *)s->init_buf->data; - p=(unsigned char *)s->init_buf->data + 1; - l2n3(len - 4, p); /* Message length */ - p += 4; - s2n(len - 10, p); /* Ticket length */ - - /* number of bytes to write */ - s->init_num= len; - s->state=SSL3_ST_SW_SESSION_TICKET_B; - s->init_off=0; - OPENSSL_free(senc); - } - - /* SSL3_ST_SW_SESSION_TICKET_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } - -int ssl3_send_cert_status(SSL *s) - { - if (s->state == SSL3_ST_SW_CERT_STATUS_A) - { - unsigned char *p; - /* Grow buffer if need be: the length calculation is as - * follows 1 (message type) + 3 (message length) + - * 1 (ocsp response type) + 3 (ocsp response length) - * + (ocsp response) - */ - if (!BUF_MEM_grow(s->init_buf, 8 + s->tlsext_ocsp_resplen)) - return -1; - - p=(unsigned char *)s->init_buf->data; - - /* do the header */ - *(p++)=SSL3_MT_CERTIFICATE_STATUS; - /* message length */ - l2n3(s->tlsext_ocsp_resplen + 4, p); - /* status type */ - *(p++)= s->tlsext_status_type; - /* length of OCSP response */ - l2n3(s->tlsext_ocsp_resplen, p); - /* actual response */ - memcpy(p, s->tlsext_ocsp_resp, s->tlsext_ocsp_resplen); - /* number of bytes to write */ - s->init_num = 8 + s->tlsext_ocsp_resplen; - s->state=SSL3_ST_SW_CERT_STATUS_B; - s->init_off = 0; - } - - /* SSL3_ST_SW_CERT_STATUS_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); - } - -# ifndef OPENSSL_NO_NPN -/* ssl3_get_next_proto reads a Next Protocol Negotiation handshake message. It - * sets the next_proto member in s if found */ -int ssl3_get_next_proto(SSL *s) - { - int ok; - unsigned proto_len, padding_len; - long n; - const unsigned char *p; - - /* Clients cannot send a NextProtocol message if we didn't see the - * extension in their ClientHello */ - if (!s->s3->next_proto_neg_seen) - { - SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION); - return -1; - } - - n=s->method->ssl_get_message(s, - SSL3_ST_SR_NEXT_PROTO_A, - SSL3_ST_SR_NEXT_PROTO_B, - SSL3_MT_NEXT_PROTO, - 514, /* See the payload format below */ - &ok); - - if (!ok) - return((int)n); - - /* s->state doesn't reflect whether ChangeCipherSpec has been received - * in this handshake, but s->s3->change_cipher_spec does (will be reset - * by ssl3_get_finished). */ - if (!s->s3->change_cipher_spec) - { - SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS); - return -1; - } - - if (n < 2) - return 0; /* The body must be > 1 bytes long */ - - p=(unsigned char *)s->init_msg; - - /* The payload looks like: - * uint8 proto_len; - * uint8 proto[proto_len]; - * uint8 padding_len; - * uint8 padding[padding_len]; - */ - proto_len = p[0]; - if (proto_len + 2 > s->init_num) - return 0; - padding_len = p[proto_len + 1]; - if (proto_len + padding_len + 2 != s->init_num) - return 0; - - s->next_proto_negotiated = OPENSSL_malloc(proto_len); - if (!s->next_proto_negotiated) - { - SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,ERR_R_MALLOC_FAILURE); - return 0; - } - memcpy(s->next_proto_negotiated, p + 1, proto_len); - s->next_proto_negotiated_len = proto_len; - - return 1; - } -# endif -#endif |