Commit 118a06717dede039d320d423a2642631f4c2bcd2

Authored by ShvaykaD
Committed by GitHub
1 parent 845d8247

[3.3.2] Changed key-alg from RSA to EC (#5260)

* changed key-alg from RSA to EC

* changed ORGANIZATIONAL_UNIT and ORGANIZATION to correct value
... ... @@ -96,7 +96,7 @@ keytool -genkeypair -v \
96 96 -keypass $CLIENT_KEY_PASSWORD \
97 97 -storepass $CLIENT_KEYSTORE_PASSWORD \
98 98 -keyalg $CLIENT_KEY_ALG \
99   - -keysize $CLIENT_KEY_SIZE\
  99 + -groupname $CLIENT_KEY_GROUP_NAME \
100 100 -validity 9999 \
101 101 -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE"
102 102
... ...
... ... @@ -16,8 +16,8 @@
16 16
17 17 DOMAIN_SUFFIX="$(hostname)"
18 18 SUBJECT_ALTERNATIVE_NAMES="ip:127.0.0.1"
19   -ORGANIZATIONAL_UNIT=Thingsboard
20   -ORGANIZATION=Thingsboard
  19 +ORGANIZATIONAL_UNIT=ThingsBoard
  20 +ORGANIZATION=ThingsBoard
21 21 CITY="San Francisco"
22 22 STATE_OR_PROVINCE=CA
23 23 TWO_LETTER_COUNTRY_CODE=US
... ... @@ -27,8 +27,8 @@ SERVER_KEY_PASSWORD=password
27 27
28 28 SERVER_KEY_ALIAS="serveralias"
29 29 SERVER_FILE_PREFIX="server"
30   -SERVER_KEY_ALG="RSA"
31   -SERVER_KEY_SIZE="2048"
  30 +SERVER_KEY_ALG="EC"
  31 +SERVER_KEY_GROUP_NAME="secp256r1"
32 32 SERVER_KEYSTORE_DIR="/etc/thingsboard/conf"
33 33
34 34 CLIENT_KEYSTORE_PASSWORD=password
... ... @@ -36,5 +36,5 @@ CLIENT_KEY_PASSWORD=password
36 36
37 37 CLIENT_KEY_ALIAS="clientalias"
38 38 CLIENT_FILE_PREFIX="client"
39   -CLIENT_KEY_ALG="RSA"
40   -CLIENT_KEY_SIZE="2048"
  39 +CLIENT_KEY_ALG="EC"
  40 +CLIENT_KEY_GROUP_NAME="secp256r1"
... ...
... ... @@ -105,7 +105,7 @@ keytool -genkeypair -v \
105 105 -keypass $SERVER_KEY_PASSWORD \
106 106 -storepass $SERVER_KEYSTORE_PASSWORD \
107 107 -keyalg $SERVER_KEY_ALG \
108   - -keysize $SERVER_KEY_SIZE \
  108 + -groupname $SERVER_KEY_GROUP_NAME \
109 109 -validity 9999 \
110 110 $EXT
111 111
... ...