Skip to content

Fix X509Certificate constructors from string #52

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

Merged
merged 1 commit into from
Dec 12, 2018
Merged

Fix X509Certificate constructors from string #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions source/nanoFramework.System.Net/X509Certificates/X509Certificate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,16 @@ public X509Certificate(byte[] certificate, string password)
/// </remarks>
public X509Certificate(string certificate)
{
_certificate = Encoding.UTF8.GetBytes(certificate);
var tempCertificate = Encoding.UTF8.GetBytes(certificate);

//////////////////////////////////////////////
// because this is parsing from a string //
// we need to keep the terminator //
//////////////////////////////////////////////
_certificate = new byte[tempCertificate.Length + 1];
Array.Copy(tempCertificate, _certificate, tempCertificate.Length);
_certificate[_certificate.Length - 1] = 0;

_password = "";

ParseCertificate(_certificate, _password, ref _issuer, ref _subject, ref _effectiveDate, ref _expirationDate);
Expand All @@ -108,10 +117,19 @@ public X509Certificate(string certificate)
/// </remarks>
public X509Certificate(string certificate, string password)
{
_certificate = Encoding.UTF8.GetBytes(certificate);
_password = password;

ParseCertificate(Encoding.UTF8.GetBytes(certificate), _password, ref _issuer, ref _subject, ref _effectiveDate, ref _expirationDate);
var tempCertificate = Encoding.UTF8.GetBytes(certificate);

//////////////////////////////////////////////
// because this is parsing from a string //
// we need to keep the terminator //
//////////////////////////////////////////////
_certificate = new byte[tempCertificate.Length + 1];
Array.Copy(tempCertificate, _certificate, tempCertificate.Length);
_certificate[_certificate.Length - 1] = 0;

ParseCertificate(_certificate, _password, ref _issuer, ref _subject, ref _effectiveDate, ref _expirationDate);
}

/// <summary>
Expand Down