FCL/sf/app/jrt: comparison javatools/javasecuritycustomization/javasecuritycustomizationtool.pl

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 my $iby_name;
 my $sis_file_name;
 my $pkg_file_name;
 my $pkg_name;
 my $package_type;
+my $s60_version;
 my $signed_sis                                     = "false";
 my $ROM                                            = "rom";
 my $SIS                                            = "sis";
 my $openssl                                        = "openssl.exe";
 my $METADATA_EXT                                   = ".metadata";
 my $JAVA_CUSTOM_SECURITY_SIS_FILENAME              = "java_custom_security.sis";
 my $NON_REMOVABLE_PACKAGE_TYPE                     = ",(0x2001FD68), 1,0,0, TYPE=PU,RU\n%{\"Nokia\"}\n:\"Nokia\"\n[0x1028315F], 0, 0, 0, {\"Series60ProductID\"}\n";
 my $REMOVABLE_PACKAGE_TYPE                         = ",(0x2001FD68), 1,0,0, TYPE=SP,RU\n%{\"Nokia\"}\n:\"Nokia\"\n[0x1028315F], 0, 0, 0, {\"Series60ProductID\"}\n";
 # IBY and PKG data
 my $CERTS_DATACAGE                                 = "\\private\\200211dc\\security\\trustroots\\device\\certificates\\";
+my $CERTS_DEST                                     = "\\resource\\java\\security\\trustroots\\";
 my $CERTS_STATE_DATACAGE                           = "\\private\\200211dc\\security\\trustroots\\device\\state\\";
 my $POLICIES_DATACAGE_SRC                          = "\\resource\\java\\security\\policies\\";
 my $POLICIES_DATACAGE_SRC_5_0                      = "\\private\\102033E6\\resource\\security\\policies\\";
 my $POLICIES_DATACAGE_DEST                         = "RESOURCE_FILES_DIR\\java\\security\\policies\\";
 open (PKG_FILE, "+>tmp/$pkg_file_name") or die "Cannot create tmp file (tmp/$pkg_file_name)\n";
 print PKG_FILE   "&EN\n#{\"$pkg_name\"}" ."$package_type";
 open (POLICY_FILE, "+>tmp/update_certs") or die "Cannot create tmp file (tmp/update_certs)\n";
 close POLICY_FILE;
 }
+open (MIDPROOTSLIST_FILE, "+>tmp/midprootslist") or die "Cannot create temp file (tmp/certs/midprootslist)\n";
 foreach my $root (@{$xmldata->{root}}) {
 # read the xml node
 $root_file = $root->{file}->[0];
 $root_domain = $root->{domain}->[0];
 print IBY_FILE $root_file_without_ext;
 print IBY_FILE "$METADATA_EXT\n";
 }
 else
 {
+print MIDPROOTSLIST_FILE $root_file_with_ext;
+print MIDPROOTSLIST_FILE "\n";
 print PKG_FILE   "\"./tmp/certs/";
 print PKG_FILE   $root_file_with_ext;
-print PKG_FILE   "\"-\"c:" . "$CERTS_DATACAGE";
+if ($s60_version eq "5.0")
+{
+print PKG_FILE   "\"-\"c:" . "$CERTS_DATACAGE";
+}
+else
+{
+print PKG_FILE   "\"-\"c:" . "$CERTS_DEST";
+}
 print PKG_FILE   $root_file_with_ext;
 print PKG_FILE   "\"\n\"./tmp/certs/";
 print PKG_FILE   $root_file_without_ext;
-print PKG_FILE   "$METADATA_EXT\"-\"c:" ."$CERTS_DATACAGE";
+if ($s60_version eq "5.0")
+{
+print PKG_FILE   "$METADATA_EXT\"-\"c:" ."$CERTS_DATACAGE";
+}
+else
+{
+print PKG_FILE   "$METADATA_EXT\"-\"c:" ."$CERTS_DEST";
+}
 print PKG_FILE   $root_file_without_ext;
 print PKG_FILE   "$METADATA_EXT\"\n";
-if ($root_state ne "")
+open (STATE_FILE, "+>tmp/certs/$root_file_without_ext$STATE_EXT") or die "Cannot create temp file (tmp/certs/$root_file_without_ext$STATE_EXT)\n";
+binmode STATE_FILE;
+my $state;
+if ($root_state eq "enabled" || $root_state eq "")
 {
-open (STATE_FILE, "+>tmp/certs/$root_file_without_ext$STATE_EXT") or die "Cannot create temp file (tmp/certs/$root_file_without_ext$STATE_EXT)\n";
+$state = pack("h8", "3000");
-binmode STATE_FILE;
+}
-my $state;
+else
-if ($root_state eq "enabled")
+{
+if ($root_state eq "disabled")
 {
-$state = pack("h8", "3000");
+$state = pack("h8", "2000");
 }
 else
 {
-if ($root_state eq "disabled")
+if ($root_state eq "removed")
 {
-$state = pack("h8", "2000");
+$state = pack("h8", "1000");
-}
-else
-{
-if ($root_state eq "removed")
-{
-$state = pack("h8", "1000");
-}
 }
 }
-print STATE_FILE $state;
-close STATE_FILE;
-print PKG_FILE   "\"./tmp/certs/";
-print PKG_FILE   $root_file_without_ext;
-print PKG_FILE   "$STATE_EXT\"-\"c:" ."$CERTS_STATE_DATACAGE";
-print PKG_FILE   $root_file_without_ext;
-print PKG_FILE   "$STATE_EXT\"\n";
 }
-}
+print STATE_FILE $state;
-}
+close STATE_FILE;
+print PKG_FILE   "\"./tmp/certs/";
+print PKG_FILE   $root_file_without_ext;
+print PKG_FILE   "$STATE_EXT\"-\"c:" ."$CERTS_STATE_DATACAGE";
+print PKG_FILE   $root_file_without_ext;
+print PKG_FILE   "$STATE_EXT\"\n";
+}
+}
+close MIDPROOTSLIST_FILE;
 	if ($deployment_destination eq $SIS)
 	{
 print PKG_FILE   "\"./tmp/update_certs\"-\"c:\\private\\102033E6\\security\\tmp\\update_certs\"\n";
+if ($s60_version ne "5.0")
+{
+print PKG_FILE   "\"./tmp/midprootslist\"-\"c:\\resource\\java\\security\\trustroots\\midprootslist\"\n";
+}
 }
 if ($deploy == 1)
 {
 print PKG_FILE   "\"\\epoc32\\release\\armv5\\urel\\javasecuritycustomization.exe\"-\"c:\\sys\\bin\\javasecuritycustomization.exe\", FR, RB, RW\n";
 }
 	mkdir "tmp/policies/external/";
 	mkdir "tmp/policies/internal/";
 # read the xml node
 $policy_name = $xmldata->{policy}->{name};
-$s60_version = $xmldata->{s60_version};
 $utp_policy_path = $xmldata->{policy}->{unidentifiedthirdparty};
 $ttp_policy_path = $xmldata->{policy}->{identifiedthirdparty};
 $operator_policy_path = $xmldata->{policy}->{operator};
 $manufacturer_policy_path = $xmldata->{policy}->{manufacturer};
 $signing_cert = $xmldata->{signing}->{cert};
 $signing_key = $xmldata->{signing}->{key};
 $package_type = $xmldata->{deploytype};
+$s60_version = $xmldata->{s60_version};
 if (($package_type ne "") && ($package_type ne "removable") && ($package_type ne "non-removable"))
 {
 print "\nERROR: when specified, the type of the deployment package can have one of the two values: 'removable' or 'non-removable'. Please check the configuration file $config_file\n";
 exit;
 }

changeset 26	dc7c549001d5
parent 21	2a9601315dfc