胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
017b96f9 1 parent 056895a9

fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 3 行删除
@@ -454,8 +454,10 @@ if [ $SRS_SSL = YES ]; then @@ -454,8 +454,10 @@ if [ $SRS_SSL = YES ]; then
454 ( 454 (
455 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 455 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
456 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 456 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
457 - ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 &&  
458 - make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && make install && 457 + ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS &&
  458 + make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \
  459 + LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} &&
  460 + make install &&
459 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && 461 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl &&
460 cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp 462 cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp
461 ) 463 )
@@ -469,7 +471,7 @@ if [ $SRS_SSL = YES ]; then @@ -469,7 +471,7 @@ if [ $SRS_SSL = YES ]; then
469 ( 471 (
470 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 472 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
471 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 473 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
472 - ./config --prefix=`pwd`/_release -no-shared && 474 + ./config --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS &&
473 make && make install && 475 make && make install &&
474 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && 476 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl &&
475 cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp 477 cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp