develpkg -pbkdf2
| @@ -92,10 +92,20 @@ | ||
| 92 | 92 | print OUT "Dependency:".$dependency."\n"; |
| 93 | 93 | close(OUT); |
| 94 | 94 | if ( $develpkgExcludeConf && (-e $develpkgExcludeConf) ) { |
| 95 | - do_system("cd ../..;tar cvz -X proj/posix/$develpkgExcludeConf . | openssl enc -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 95 | + if ( $develpkgSystem >= 10 ) { | |
| 96 | + do_system("cd ../..;tar cvz -X proj/posix/$develpkgExcludeConf . | openssl enc -pbkdf2 -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 97 | + } | |
| 98 | + else { | |
| 99 | + do_system("cd ../..;tar cvz -X proj/posix/$develpkgExcludeConf . | openssl enc -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 100 | + } | |
| 96 | 101 | } |
| 97 | 102 | else { |
| 98 | - do_system("cd ../..;tar cvz . | openssl enc -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 103 | + if ( $develpkgSystem >= 10 ) { | |
| 104 | + do_system("cd ../..;tar cvz . | openssl enc -pbkdf2 -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 105 | + } | |
| 106 | + else { | |
| 107 | + do_system("cd ../..;tar cvz . | openssl enc -e -aes256 -kfile $develpkgEncodeKey -out $develpkgPublic/$archive"); | |
| 108 | + } | |
| 99 | 109 | } |
| 100 | 110 | do_system("rm -rf ../../develpackage.info"); |
| 101 | 111 |
modules/make.project/trunk/utils/subs/distribution.pl