equal
deleted
inserted
replaced
105 IMPORTPASSWORD="-importpass" |
105 IMPORTPASSWORD="-importpass" |
106 fi |
106 fi |
107 |
107 |
108 echo "Storing user password (protected by ${i})" |
108 echo "Storing user password (protected by ${i})" |
109 echo "${USER_PWD}" | \ |
109 echo "${USER_PWD}" | \ |
110 ${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${IMPORTPASSWORD} \ |
110 ${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} ${IMPORTPASSWORD} \ |
111 -storetype pkcs12 -keystore mykeystore.p12 -storepass changeit \ |
111 -storetype pkcs12 -keystore mykeystore.p12 -storepass changeit \ |
112 -alias "${ALIAS_PREFIX}${i}" ${KEYALG} > /dev/null 2>&1 |
112 -alias "${ALIAS_PREFIX}${i}" ${KEYALG} > /dev/null 2>&1 |
113 if [ $? -ne 0 ]; then |
113 if [ $? -ne 0 ]; then |
114 echo Error |
114 echo Error |
115 else |
115 else |
117 COUNTER=`expr ${COUNTER} + 1` |
117 COUNTER=`expr ${COUNTER} + 1` |
118 fi |
118 fi |
119 done |
119 done |
120 echo |
120 echo |
121 |
121 |
122 COUNTER2=`${TESTJAVA}${FILESEP}bin${FILESEP}keytool -list -storetype pkcs12 \ |
122 COUNTER2=`${TESTJAVA}${FILESEP}bin${FILESEP}keytool ${TESTTOOLVMOPTS} -list -storetype pkcs12 \ |
123 -keystore mykeystore.p12 -storepass changeit | grep -c "${ALIAS_PREFIX}"` |
123 -keystore mykeystore.p12 -storepass changeit | grep -c "${ALIAS_PREFIX}"` |
124 |
124 |
125 RESULT="stored ${COUNTER} user passwords, detected ${COUNTER2} user passwords" |
125 RESULT="stored ${COUNTER} user passwords, detected ${COUNTER2} user passwords" |
126 if [ $COUNTER -ne $COUNTER2 -o $COUNTER -lt 11 ]; then |
126 if [ $COUNTER -ne $COUNTER2 -o $COUNTER -lt 11 ]; then |
127 echo "ERROR: $RESULT" |
127 echo "ERROR: $RESULT" |