Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
47c1735a
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47c1735a
编写于
6月 28, 2004
作者:
R
Richard Levitte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NetWare fixes provided by Verdon Walker for OpenSSL 0.9.8-dev.
The changes have been mailed to <crypt@bis.doc.gov> as well. PR: 903
上级
7d3932e8
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
59 addition
and
38 deletion
+59
-38
Configure
Configure
+1
-0
INSTALL.NW
INSTALL.NW
+31
-32
Netware/set_env.bat
Netware/set_env.bat
+3
-3
apps/s_client.c
apps/s_client.c
+10
-0
crypto/rand/rand_nw.c
crypto/rand/rand_nw.c
+8
-3
crypto/sha/shatest.c
crypto/sha/shatest.c
+1
-0
e_os.h
e_os.h
+5
-0
未找到文件。
Configure
浏览文件 @
47c1735a
...
...
@@ -529,6 +529,7 @@ my %table=(
"netware-clib", "mwccnlm:::::${x86_gcc_opts}:::",
# netware-libc => LibC/NKS support
"netware-libc", "mwccnlm:::::BN_LLONG ${x86_gcc_opts}:::",
"netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall::::${x86_gcc_opts}:::",
# DJGPP
"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
...
...
INSTALL.NW
浏览文件 @
47c1735a
...
...
@@ -99,9 +99,9 @@ following tools may be required:
NLM and NetWare libraries for C (including CLIB and XPlat):
If you are going to build a CLIB version of OpenSSL, you will
need the CLIB headers and imports. The March, 2001 NDK release or
later is recommended.
If you are going to build a CLIB version of OpenSSL, you will
need the CLIB headers and imports. The March, 2001 NDK release or
later is recommended.
Earlier versions should work but haven't been tested. In recent
versions the import files have been consolidated and function
...
...
@@ -115,9 +115,9 @@ following tools may be required:
LIBC - BUILDS:
Libraries for C (LibC) - LibC headers and import files
If you are going to build a LibC version of OpenSSL, you will
need the LibC headers and imports. The March 14, 2002 NDK release or
later is required.
If you are going to build a LibC version of OpenSSL, you will
need the LibC headers and imports. The March 14, 2002 NDK release or
later is required.
NOTE: The LibC SDK includes the necessary WinSock2 support. It
It is not necessary to download the WinSock2 Developer when building
...
...
@@ -133,8 +133,8 @@ The set_env.bat file is a template you can use to set up the path
and environment variables you will need to build. Modify the
various lines to point to YOUR tools and run set_env.bat.
netware\set_env.bat [target]
netware\set_env.bat [target]
target - "netware-clib" - CLib NetWare build
- "netware-libc" - LibC NetWare build
...
...
@@ -145,23 +145,21 @@ environment variables:
MWCIncludes - The location of the NDK include files.
CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
LibC ex: set MWCIncludes=c:\ndk\libc\include
CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
LibC ex: set MWCIncludes=c:\ndk\libc\include
PRELUDE - The absolute path of the prelude object to link with. For
a CLIB build it is recommended you use the "nwpre.obj" file shipped
with the Metrowerks PDK for NetWare. For a LibC build you should
use the "libcpre.o" file delivered with the LibC NDK components.
CLIB ex: set PRELUDE=c:\codewar\novell support\metrowerks support\
libraries\runtime\nwpre.obj
LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
a CLIB build it is recommended you use the "clibpre.o" files shipped
with the Metrowerks PDK for NetWare. For a LibC build you should
use the "libcpre.o" file delivered with the LibC NDK components.
CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
IMPORTS - The locaton of the NDK import files.
CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
LibC ex: set IMPORTS=c:\ndk\libc\imports
CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
LibC ex: set IMPORTS=c:\ndk\libc\imports
In order to build, you need to run the Perl scripts to configure the build
...
...
@@ -173,7 +171,7 @@ If an assembly option is specified, it also runs the scripts to generate
the assembly code. Always run build.bat from the "openssl" directory.
netware\build [target] [debug opts] [assembly opts] [configure opts]
target - "netware-clib" - CLib NetWare build
- "netware-libc" - LibC NetWare build
...
...
@@ -184,16 +182,16 @@ the assembly code. Always run build.bat from the "openssl" directory.
"no-asm" - don't use assembly
configure opts- all unrecognized arguments are passed to the
perl configure script
perl configure script
examples:
CLIB build, debug, without assembly:
netware\build.bat netware-clib debug no-asm
LibC build, non-debug, using NASM assembly:
netware\build.bat netware-libc nw-nasm
CLIB build, debug, without assembly:
netware\build.bat netware-clib debug no-asm
LibC build, non-debug, using NASM assembly:
netware\build.bat netware-libc nw-nasm
Running build.bat generates a make file to be processed by your make
tool (gmake or nmake):
...
...
@@ -207,7 +205,7 @@ subdirectory (in the order listed below):
perl configure no-asm [other config opts] [netware-clib|netware-libc]
configures no assembly build for specified netware environment
(CLIB or LibC).
(CLIB or LibC).
perl util\mkfiles.pl >MINFO
generates a listing of source files (used by mk1mf)
...
...
@@ -434,4 +432,5 @@ functions are actually delivered in the binaries, but they were left out of
the import files. The issues should be fixed in the September 2001 release
of the NDK. If you experience the problems you can temporarily
work around it by manually adding the missing symbols to your version of
"clib.imp".
"clib.imp".
Netware/set_env.bat
浏览文件 @
47c1735a
...
...
@@ -60,10 +60,10 @@ if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports
if
"
%CLIB_BUILD%
"
==
"Y"
set
IMPORTS
=
%TOOLS%
\ndk\nwsdk\imports
rem Set PRELUDE to the absolute path of the prelude object to link with in
rem the Metrowerks NetWare PDK - NOTE: for Clib builds "
nwpre.obj
" is
rem the Metrowerks NetWare PDK - NOTE: for Clib builds "
clibpre.o
" is
rem recommended, for LibC NKS builds libcpre.o must be used
if
"
%LIBC_BUILD%
"
==
"Y"
set
PRELUDE
=
%
TOOLS%
\ndk\libc\imports
\libcpre.o
if
"
%CLIB_BUILD%
"
==
"Y"
set
PRELUDE
=
%
TOOLS%
\codewar\pdk_21\novell
support
\metrowerks
support
\libraries\runtime\nwpre.obj
if
"
%LIBC_BUILD%
"
==
"Y"
set
PRELUDE
=
%
IMPORTS%
\libcpre.o
if
"
%CLIB_BUILD%
"
==
"Y"
set
PRELUDE
=
%
IMPORTS%
\clibpre.o
if
"
%LIBC_BUILD%
"
==
"Y"
echo
Enviroment
configured
for
LibC
build
...
...
apps/s_client.c
浏览文件 @
47c1735a
...
...
@@ -690,6 +690,16 @@ re_start:
}
else
i
=
select
(
width
,(
void
*
)
&
readfds
,(
void
*
)
&
writefds
,
NULL
,
NULL
);
}
#elif defined(OPENSSL_SYS_NETWARE)
if
(
!
write_tty
)
{
if
(
read_tty
)
{
tv
.
tv_sec
=
1
;
tv
.
tv_usec
=
0
;
i
=
select
(
width
,(
void
*
)
&
readfds
,(
void
*
)
&
writefds
,
NULL
,
&
tv
);
}
else
i
=
select
(
width
,(
void
*
)
&
readfds
,(
void
*
)
&
writefds
,
NULL
,
NULL
);
}
#else
i
=
select
(
width
,(
void
*
)
&
readfds
,(
void
*
)
&
writefds
,
NULL
,
NULL
);
...
...
crypto/rand/rand_nw.c
浏览文件 @
47c1735a
/* crypto/rand/rand_
win
.c */
/* crypto/rand/rand_
nw
.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
...
...
@@ -116,7 +116,7 @@
#if defined (OPENSSL_SYS_NETWARE)
#if defined(NETWARE_LIBC)
#include <nks
\
thread.h>
#include <nks
/
thread.h>
#endif
extern
long
RunningProcess
;
...
...
@@ -147,18 +147,23 @@ int RAND_poll(void)
for
(
i
=
2
;
i
<
ENTROPY_NEEDED
;
i
++
)
{
#ifdef __MWERKS__
asm
{
rdtsc
mov
tsc
,
eax
}
#else
asm
volatile
(
"rdtsc"
:
"=A"
(
tsc
));
#endif
RAND_add
(
&
tsc
,
sizeof
(
tsc
),
1
);
l
=
GetSuperHighResolutionTimer
();
RAND_add
(
&
l
,
sizeof
(
l
),
0
);
# if defined(NETWARE_LIBC)
NXThreadYield
();
NXThreadYield
();
# else
/* NETWARE_CLIB */
ThreadSwitchWithDelay
();
# endif
...
...
crypto/sha/shatest.c
浏览文件 @
47c1735a
...
...
@@ -161,6 +161,7 @@ int main(int argc, char *argv[])
#ifdef OPENSSL_SYS_NETWARE
if
(
err
)
printf
(
"ERROR: %d
\n
"
,
err
);
#endif
EVP_MD_CTX_cleanup
(
&
c
);
EXIT
(
err
);
return
(
0
);
}
...
...
e_os.h
浏览文件 @
47c1735a
...
...
@@ -181,6 +181,11 @@ extern "C" {
#define closesocket(s) close(s)
#define readsocket(s,b,n) read((s),(b),(n))
#define writesocket(s,b,n) write((s),(char *)(b),(n))
#elif defined(OPENSSL_SYS_NETWARE)
#define get_last_socket_error() WSAGetLastError()
#define clear_socket_error() WSASetLastError(0)
#define readsocket(s,b,n) recv((s),(b),(n),0)
#define writesocket(s,b,n) send((s),(b),(n),0)
#else
#define get_last_socket_error() errno
#define clear_socket_error() errno=0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录