Skip to content

Change md5withRSA to SHA1withRSA which is the default sig alg. #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fekberg wants to merge 4 commits into from
Closed

Change md5withRSA to SHA1withRSA which is the default sig alg. #927

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e1f931
Change md5withRSA to SHA1withRSA which is the default sig alg.
fekberg Oct 9, 2017
03027bd
Add support for overriding the default signing algorithm used with ja…
fekberg Oct 10, 2017
24d0a75
ApkSigningAlgorithm is not private and should not be prefixed with _
fekberg Oct 10, 2017
1c3b505
Fix typo in AndroidSignPackage
fekberg Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tasks/AndroidSignPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public class AndroidSignPackage : AndroidToolTask

public string TimestampAuthorityCertificateAlias { get; set; }

protected override string GenerateCommandLineCommands ()
public string SigningAlgorithm { get; set; }

protected override string GenerateCommandLineCommands ()
{
var cmd = new CommandLineBuilder ();

Expand All @@ -42,8 +44,8 @@ protected override string GenerateCommandLineCommands ()
cmd.AppendSwitchIfNotNull ("-storepass ", StorePass);
cmd.AppendSwitchIfNotNull ("-keypass ", KeyPass);
cmd.AppendSwitchIfNotNull ("-digestalg ", "SHA1");
cmd.AppendSwitchIfNotNull ("-sigalg ", "md5withRSA");
cmd.AppendSwitchIfNotNull ("-signedjar ", String.Format ("{0}{1}{2}-Signed-Unaligned.apk", SignedApkDirectory, Path.DirectorySeparatorChar, Path.GetFileNameWithoutExtension (UnsignedApk)));
cmd.AppendSwitchIfNotNull ("-sigalg ", string.IsNullorWitespace(SigningAlgorithm) ? "md5withRSA" : SigningAlgorithm);
cmd.AppendSwitchIfNotNull ("-signedjar ", String.Format ("{0}{1}{2}-Signed-Unaligned.apk", SignedApkDirectory, Path.DirectorySeparatorChar, Path.GetFileNameWithoutExtension (UnsignedApk)));

cmd.AppendFileNameIfNotNull (UnsignedApk);
cmd.AppendSwitch (KeyAlias);
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,6 +2439,7 @@ because xbuild doesn't support framework reference assemblies.
ToolExe="$(JarsignerToolExe)"
TimestampAuthorityUrl="$(JarsignerTimestampAuthorityUrl)"
TimestampAuthorityCertificateAlias="$(JarsignerTimestampAuthorityCertificateAlias)"
SigningAlgorithm="$(_ApkSigningAlgorithm)"

@dellis1972 dellis1972 Oct 10, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use ApkSigningAlgorithm rather than _ApkSigningAlgorithm. In msbuild the convention is _ prefixed properties are private and should not be used by the end user. Ones without are public. So we should remove the _ since we expect the user to override this.

/>
<Message Text="Signed android package '$(ApkFileSigned)'" />
<ItemGroup>
Expand Down