Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-09 11:51:05 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
017b96f9b528ea42bbdd14f212420f1bc0367bd4
017b96f9
1 parent
056895a9
fix the heartbleed bug, see:
http://www.openssl.org/news/secadv_20140407.txt
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
5 行增加
和
3 行删除
trunk/auto/depends.sh
trunk/auto/depends.sh
查看文件 @
017b96f
...
...
@@ -454,8 +454,10 @@ if [ $SRS_SSL = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/openssl-1.0.1f
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/openssl-1.0.1f.zip
&&
cd
openssl-1.0.1f
&&
./Configure --prefix
=
`
pwd
`
/_release -no-shared no-asm linux-armv4
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
LD
=
${
SrsArmLD
}
LINK
=
${
SrsArmGCC
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install
&&
./Configure --prefix
=
`
pwd
`
/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS
&&
make
CC
=
${
SrsArmCC
}
GCC
=
${
SrsArmGCC
}
AR
=
"
${
SrsArmAR
}
r"
\
LD
=
${
SrsArmLD
}
LINK
=
${
SrsArmGCC
}
RANDLIB
=
${
SrsArmRANDLIB
}
&&
make install
&&
cd
..
&&
rm -rf openssl
&&
ln -sf openssl-1.0.1f/_release openssl
&&
cd
..
&&
touch
${
SRS_OBJS
}
/_flag.ssl.arm.tmp
)
...
...
@@ -469,7 +471,7 @@ if [ $SRS_SSL = YES ]; then
(
rm -rf
${
SRS_OBJS
}
/openssl-1.0.1f
&&
cd
${
SRS_OBJS
}
&&
unzip -q ../3rdparty/openssl-1.0.1f.zip
&&
cd
openssl-1.0.1f
&&
./config --prefix
=
`
pwd
`
/_release -no-shared
&&
./config --prefix
=
`
pwd
`
/_release -no-shared
-DOPENSSL_NO_HEARTBEATS
&&
make
&&
make install
&&
cd
..
&&
rm -rf openssl
&&
ln -sf openssl-1.0.1f/_release openssl
&&
cd
..
&&
rm -f
${
SRS_OBJS
}
/_flag.ssl.arm.tmp
...
...
请
注册
或
登录
后发表评论