Imported Upstream version 6.8.0.73

Former-commit-id: d18deab1b47cfd3ad8cba82b3f37d00eec2170af
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-12-10 18:00:56 +00:00
parent bceda29824
commit 73ee7591e8
1043 changed files with 16271 additions and 22080 deletions

View File

@@ -102,8 +102,8 @@ namespace Mono.Cecil {
if (symbol_writer_provider == null && parameters.WriteSymbols)
symbol_writer_provider = new DefaultSymbolWriterProvider ();
if (parameters.StrongNameKeyPair != null && name != null) {
name.PublicKey = parameters.StrongNameKeyPair.PublicKey;
if (parameters.HasStrongNameKey && name != null) {
name.PublicKey = CryptoService.GetPublicKey (parameters);
module.Attributes |= ModuleAttributes.StrongNameSigned;
}
@@ -125,8 +125,8 @@ namespace Mono.Cecil {
stream.value.SetLength (0);
writer.WriteImage ();
if (parameters.StrongNameKeyPair != null)
CryptoService.StrongName (stream.value, writer, parameters.StrongNameKeyPair);
if (parameters.HasStrongNameKey)
CryptoService.StrongName (stream.value, writer, parameters);
}
} finally {
module.metadata_builder = null;

View File

@@ -199,6 +199,8 @@ namespace Mono.Cecil {
Stream symbol_stream;
ISymbolWriterProvider symbol_writer_provider;
bool write_symbols;
byte [] key_blob;
string key_container;
SR.StrongNameKeyPair key_pair;
public uint? Timestamp {
@@ -221,6 +223,20 @@ namespace Mono.Cecil {
set { write_symbols = value; }
}
public bool HasStrongNameKey {
get { return key_pair != null || key_blob != null || key_container != null; }
}
public byte [] StrongNameKeyBlob {
get { return key_blob; }
set { key_blob = value; }
}
public string StrongNameKeyContainer {
get { return key_container; }
set { key_container = value; }
}
public SR.StrongNameKeyPair StrongNameKeyPair {
get { return key_pair; }
set { key_pair = value; }

View File

@@ -29,6 +29,8 @@ namespace Mono.Cecil {
UI1 = 17,
UI2 = 18,
UI4 = 19,
I8 = 20,
UI8 = 21,
Int = 22,
UInt = 23
}