Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit b93cf6d

Browse files
edhongcyedhongcy
committed
chore: bump QDK to 2.3.11
1 parent 8779ccc commit b93cf6d

File tree

4 files changed

+46
-13
lines changed

4 files changed

+46
-13
lines changed

‎QDK_2.x/bin/qbuild

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,14 @@ do_code_signing(){
521521
fi
522522
[ -z "$QNAP_CODE_SIGNING_SERVER_IP" ] && QNAP_CODE_SIGNING_SERVER_IP=$DEFAULT_QNAP_CODE_SIGNING_SERVER_IP
523523
[ -z "$QNAP_CODE_SIGNING_SERVER_PORT" ] && QNAP_CODE_SIGNING_SERVER_PORT=$DEFAULT_QNAP_CODE_SIGNING_SERVER_PORT
524-
$CS_PYTHON "${QDK_SCRIPTS_DIR}/codesigning_qpkg.py" cwd="`pwd`" buildpath=$build_dir csv="${QNAP_CODE_SIGNING_CSV}" server=${QNAP_CODE_SIGNING_SERVER_IP}:${QNAP_CODE_SIGNING_SERVER_PORT} | tee -a code_signing.log
525-
if [ $? != 0 ]; then
526-
err_msg "$QDK_QPKG_FILE: Failed to add anti-tamper support"
524+
if [ "$QNAP_CODE_SIGNING_SERVER_IP" = "172.17.21.68" ]; then
525+
msg "$QPKG_NAME: Do not used 172.17.21.68:5000 anymore. Please use codesigning.qnap.com.tw:5001. You also need to check the DNS setting on your build environment so that codesigning.qnap.com.tw can be resolved properly"
526+
QNAP_CODE_SIGNING_SERVER_IP="codesigning.qnap.com.tw"
527+
QNAP_CODE_SIGNING_SERVER_PORT="5001"
528+
fi
529+
$CS_PYTHON "${QDK_SCRIPTS_DIR}/codesigning_qpkg.py" cwd="`pwd`" buildpath=$build_dir csv="${QNAP_CODE_SIGNING_CSV}" server=${QNAP_CODE_SIGNING_SERVER_IP}:${QNAP_CODE_SIGNING_SERVER_PORT} 2>&1 | tee -a code_signing.log
530+
if [ ${PIPESTATUS[0]} != 0 ]; then
531+
err_msg "$QPKG_NAME: Failed to add anti-tamper support"
527532
fi
528533
}
529534

@@ -934,6 +939,11 @@ add_qpkg_signature(){
934939
verbose_msg "Connecting to code signing server to create digital signature..."
935940
[ -z "$QNAP_CODE_SIGNING_SERVER_IP" ] && QNAP_CODE_SIGNING_SERVER_IP=$DEFAULT_QNAP_CODE_SIGNING_SERVER_IP
936941
[ -z "$QNAP_CODE_SIGNING_SERVER_PORT" ] && QNAP_CODE_SIGNING_SERVER_PORT=$DEFAULT_QNAP_CODE_SIGNING_SERVER_PORT
942+
if [ "$QNAP_CODE_SIGNING_SERVER_IP" = "172.17.21.68" ]; then
943+
msg "$QPKG_NAME: Do not used 172.17.21.68:5000 anymore. Please use codesigning.qnap.com.tw:5001. You also need to check the DNS setting on your build environment so that codesigning.qnap.com.tw can be resolved properly"
944+
QNAP_CODE_SIGNING_SERVER_IP="codesigning.qnap.com.tw"
945+
QNAP_CODE_SIGNING_SERVER_PORT="5001"
946+
fi
937947
openssl dgst -sha1 -binary "${QDK_QPKG_FILE}" > "${QDK_QPKG_FILE}.sha"
938948
$CS_PYTHON "${QDK_SCRIPTS_DIR}/codesigning_qpkg_cms.py" \
939949
cwd="`pwd`" server=${QNAP_CODE_SIGNING_SERVER_IP}:${QNAP_CODE_SIGNING_SERVER_PORT} \
@@ -1609,12 +1619,17 @@ add_code_signing(){
16091619
# Source the configuration file to make all its fields available.
16101620
. "$code_signing_cfg" || err_msg "$code_signing_cfg: corrupt configuration file"
16111621

1612-
if [ -z "$PRIVATE_KEY" ]; then
1622+
if [ "x${QNAP_CODE_SIGNING}" = "x1" ]; then
16131623
# Connecting to server
16141624
[ -z "$QNAP_CODE_SIGNING_SERVER_IP" ] && QNAP_CODE_SIGNING_SERVER_IP=$DEFAULT_QNAP_CODE_SIGNING_SERVER_IP
16151625
[ -z "$QNAP_CODE_SIGNING_SERVER_PORT" ] && QNAP_CODE_SIGNING_SERVER_PORT=$DEFAULT_QNAP_CODE_SIGNING_SERVER_PORT
16161626
[ -n "$QPKG_NAME" ] || err_msg "$code_signing_cfg: QPKG_NAME not provided"
16171627
[ -n "$QPKG_VER" ] || err_msg "$code_signing_cfg: QPKG_VER not provided"
1628+
if [ "$QNAP_CODE_SIGNING_SERVER_IP" = "172.17.21.68" ]; then
1629+
msg "$QPKG_NAME: Do not used 172.17.21.68:5000 anymore. Please use codesigning.qnap.com.tw:5001. You also need to check the DNS setting on your build environment so that codesigning.qnap.com.tw can be resolved properly"
1630+
QNAP_CODE_SIGNING_SERVER_IP="codesigning.qnap.com.tw"
1631+
QNAP_CODE_SIGNING_SERVER_PORT="5001"
1632+
fi
16181633
else
16191634
# 3rd party, not connected to server, sign using local certificate and private key
16201635
[ -f "$QNAP_CERT" ] || err_msg "$code_signing_cfg: QNAP_CERT $QNAP_CERT cannot be found"
@@ -1636,15 +1651,21 @@ add_code_signing(){
16361651
#eval "$dd_cmd"
16371652
openssl dgst -sha1 -binary "${qpkg}.$$" > "${qpkg}.sha"
16381653

1639-
if [ -z "$PRIVATE_KEY" ]; then
1654+
if [ "x${QNAP_CODE_SIGNING}" = "x1" ]; then
16401655
# Send qpkg digest to server
16411656
verbose_msg "Connecting to code signing server to create digital signature..."
16421657
$CS_PYTHON "${QDK_SCRIPTS_DIR}/codesigning_qpkg_cms.py" server=${QNAP_CODE_SIGNING_SERVER_IP}:${QNAP_CODE_SIGNING_SERVER_PORT} qpkgname=${QPKG_NAME} version=${QPKG_VER} in="${qpkg}.sha" out="${qpkg}.msg" 2>&1 | tee -a code_signing.log
16431658
else
16441659
# 3rd party, not connected to server, sign using local certificate and private key
16451660
verbose_msg "Creating code signing digital signature..."
1661+
if [ -f "${CA_CERTS}" ]; then
16461662
openssl cms -sign -in "${qpkg}.sha" -binary -nodetach -out "${qpkg}.msg" \
1663+
-signer ${QNAP_CERT} -inkey ${PRIVATE_KEY} \
1664+
-certfile ${CA_CERTS} 2>/dev/null
1665+
else
1666+
openssl cms -sign -in "${qpkg}.sha" -binary -nodetach -out "${qpkg}.msg" \
16471667
-signer ${QNAP_CERT} -inkey ${PRIVATE_KEY} 2>/dev/null
1668+
fi
16481669
local err_code=$?
16491670
if [ $err_code = "2" ]; then
16501671
warn_msg "Failed to open certificate or private key"
@@ -1682,6 +1703,11 @@ verify_code_signing_online(){
16821703

16831704
[ -z "$QNAP_CODE_SIGNING_SERVER_IP" ] && QNAP_CODE_SIGNING_SERVER_IP=$DEFAULT_QNAP_CODE_SIGNING_SERVER_IP
16841705
[ -z "$QNAP_CODE_SIGNING_SERVER_PORT" ] && QNAP_CODE_SIGNING_SERVER_PORT=$DEFAULT_QNAP_CODE_SIGNING_SERVER_PORT
1706+
if [ "$QNAP_CODE_SIGNING_SERVER_IP" = "172.17.21.68" ]; then
1707+
msg "$QPKG_NAME: Do not used 172.17.21.68:5000 anymore. Please use codesigning.qnap.com.tw:5001. You also need to check the DNS setting on your build environment so that codesigning.qnap.com.tw can be resolved properly"
1708+
QNAP_CODE_SIGNING_SERVER_IP="codesigning.qnap.com.tw"
1709+
QNAP_CODE_SIGNING_SERVER_PORT="5001"
1710+
fi
16851711

16861712
local curl_cmd=
16871713
local output=
@@ -1771,17 +1797,24 @@ verify_code_signing_offline(){
17711797
openssl cms -verify -in $1 -CAfile $ca_cert 2>/dev/null > $verify_dgst_file
17721798
$CMD_CMP $2 $verify_dgst_file 2>/dev/null
17731799
if [ $? -eq 0 ]; then
1774-
msg "Code signing digital signature verification successful"
1800+
msg "Code signing digital signature verification successful (QNAP-issued certificate)"
17751801
ret=0
17761802
else
17771803
openssl cms -verify -in $1 -CAfile $ca_cert_2 2>/dev/null > $verify_dgst_file
17781804
$CMD_CMP $2 $verify_dgst_file 2>/dev/null
17791805
if [ $? -eq 0 ]; then
1780-
msg "Code signing digital signature verification successful"
1806+
msg "Code signing digital signature verification successful (QNAP-issued certificate)"
17811807
ret=0
17821808
else
1783-
msg "Code signing digital signature verification failed"
1784-
ret=1
1809+
openssl cms -verify -purpose any -CApath /etc/ssl/certs/ -in $1 > $verify_dgst_file
1810+
$CMD_CMP $2 $verify_dgst_file 2>/dev/null
1811+
if [ $? -eq 0 ]; then
1812+
msg "Code signing digital signature verification successful (non QNAP-issued certificate)"
1813+
ret=0
1814+
else
1815+
msg "Code signing digital signature verification failed"
1816+
ret=1
1817+
fi
17851818
fi
17861819
fi
17871820
/bin/rm $verify_dgst_file
@@ -1815,7 +1848,7 @@ verify_code_signing(){
18151848
openssl dgst -sha1 -binary $qpkg_data_file 2>/dev/null > $dgst_file
18161849
/bin/dd if=$qpkg bs=1 skip=$code_signing_pos count=$code_signing_len 2>/dev/null > $signature_file
18171850
local ret=
1818-
if [ ! -f "private_key" ] && [ -z "$QNAP_CA_CERT" ]; then
1851+
if [ "x${QNAP_CODE_SIGNING}" = "x1" ]; then
18191852
verify_code_signing_online ${signature_file} ${dgst_file}
18201853
ret=$?
18211854
else

‎QDK_2.x/qdk.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
QDK_VERSION=2.3.10
1+
QDK_VERSION=2.3.11

‎QDK_2.x/scripts/code_signing.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
QPKG_NAME="QDK"
2-
QPKG_VER="2.3.10"
2+
QPKG_VER="2.3.11"
33
QNAP_CODE_SIGNING_SERVER_IP=codesigning.qnap.com.tw
44
QNAP_CODE_SIGNING_SERVER_PORT=5001

‎QDK_2.x/scripts/qinstall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# A QPKG installation script for QDK
77
#
8-
# QDK V.2.3.9
8+
# QDK V.2.3.11
99
#
1010
# Copyright (C) 2009,2010 QNAP Systems, Inc.
1111
# Copyright (C) 2010,2011 Michael Nordstrom

0 commit comments

Comments
 (0)