Skip to content
This repository was archived by the owner on Mar 28, 2018. It is now read-only.

Commit 230fe49

Browse files
committed
Merge issue branch 'issues/ndn-0001-configuring-key-name'
2 parents cde4fde + aa87eab commit 230fe49

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

csrc/util/ndn-sign-key

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ fi
113113

114114
PUBCERT="$(dirname $PEM_FILE)/$(basename $PEM_FILE .pem).pubcert"
115115

116-
pubkey_base64=`$OPENSSL x509 -in "$PEM_FILE" -pubkey -noout | $OPENSSL rsa -pubin -pubout -inform PEM -outform DER 2> /dev/null | $BASE64`
116+
pubkey_base64=`$OPENSSL x509 -in "$PEM_FILE" -pubkey -noout | $OPENSSL rsa -pubin -pubout -inform PEM -outform DER 2> /dev/null | $BASE64 | tr -d '\n'`
117117
pubkey_binhash=`echo $pubkey_base64 | $BASE64 --decode | $OPENSSL dgst -sha256 -binary | $HEXDUMP -v -e '1/1 "^%02x"' | sed -e 's/\^/\%/g'`
118118

119-
info_base64=`echo "<Meta><Name>$IDENTITY</Name><Affiliation>$AFFILIATION</Affiliation><Valid_to>$VALID_TO</Valid_to></Meta>" | $BASE64`
119+
info_base64=`echo "<Meta><Name>$IDENTITY</Name><Affiliation>$AFFILIATION</Affiliation><Valid_to>$VALID_TO</Valid_to></Meta>" | $BASE64 | tr -d '\n'`
120120

121121
export KEY_PASSWORD=${CCNX_KEYSTORE_PASSWORD:-"Th1s1sn0t8g00dp8ssw0rd."}
122122

0 commit comments

Comments
 (0)