summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongsun Lee <ds73.lee@samsung.com>2016-10-21 13:13:16 +0900
committerkidong kim <kd0228.kim@samsung.com>2016-10-21 14:40:41 +0900
commit574f9ecee0071683d2b22b8f30954853b66988a3 (patch)
tree209c20a3fe53245c2e366ebce24fe2d5911cf836
parentd2c6b3d3c737550eaf1f5b5738c487c704ba99bd (diff)
downloadsecurity-574f9ecee0071683d2b22b8f30954853b66988a3.tar.gz
security-574f9ecee0071683d2b22b8f30954853b66988a3.tar.bz2
security-574f9ecee0071683d2b22b8f30954853b66988a3.zip
Remove build warning for use of deprecated API
- Marshal.PtrToStructure(ptr, type) --> Marshal.PtrToStructure<T>(ptr) Change-Id: I2543a61091ab50d2d31b529f8977e43a894419bf Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs2
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs2
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs2
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs2
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs2
-rwxr-xr-x[-rw-r--r--]Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs2
6 files changed, 6 insertions, 6 deletions
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
index 8e96852..91236c1 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
@@ -57,7 +57,7 @@ namespace Tizen.Security.SecureRepository
{
base.SetHandle(ptrCkmcCert);
- CkmcCert ckmcCert = (CkmcCert)Marshal.PtrToStructure(ptrCkmcCert, typeof(CkmcCert));
+ CkmcCert ckmcCert = Marshal.PtrToStructure<CkmcCert>(ptrCkmcCert);
Binary = new byte[ckmcCert.size];
Marshal.Copy(ckmcCert.rawCert, Binary, 0, Binary.Length);
Format = (DataFormat)ckmcCert.dataFormat;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
index 6e6ebdf..c64b32b 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
@@ -43,7 +43,7 @@ namespace Tizen.Security.SecureRepository
{
base.SetHandle(ptr);
- CkmcKey ckmcKey = (CkmcKey)Marshal.PtrToStructure(handle, typeof(CkmcKey));
+ CkmcKey ckmcKey = Marshal.PtrToStructure<CkmcKey>(handle);
Binary = new byte[ckmcKey.size];
Marshal.Copy(ckmcKey.rawKey, Binary, 0, Binary.Length);
Type = (KeyType)ckmcKey.keyType;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
index 7fc49ee..e682c65 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
@@ -82,7 +82,7 @@ namespace Tizen.Security.SecureRepository
{
this.SetHandle(ptrCkmcPkcs12);
- CkmcPkcs12 ckmcPkcs12 = (CkmcPkcs12)Marshal.PtrToStructure(handle, typeof(CkmcPkcs12));
+ CkmcPkcs12 ckmcPkcs12 = Marshal.PtrToStructure<CkmcPkcs12>(handle);
this.PrivateKey = new Key(ckmcPkcs12.privateKey, false);
if (ckmcPkcs12.certificate != IntPtr.Zero)
this.Certificate = new Certificate(ckmcPkcs12.certificate, false);
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
index 8da2127..d7a5005 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
@@ -30,7 +30,7 @@ namespace Tizen.Security.SecureRepository
List<string> aliases = new List<string>();
while (ptrAliases != IntPtr.Zero)
{
- CkmcAliasList ckmcAliasList = (CkmcAliasList)Marshal.PtrToStructure(ptrAliases, typeof(CkmcAliasList));
+ CkmcAliasList ckmcAliasList = Marshal.PtrToStructure<CkmcAliasList>(ptrAliases);
aliases.Add(Marshal.PtrToStringAnsi(ckmcAliasList.alias));
ptrAliases = ckmcAliasList.next;
}
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
index b0be5e9..9f87d46 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
@@ -39,7 +39,7 @@ namespace Tizen.Security.SecureRepository
IntPtr ptrCurr = handle;
while (ptrCurr != IntPtr.Zero)
{
- CkmcCertList ckmcCertList = (CkmcCertList)Marshal.PtrToStructure(ptrCurr, typeof(CkmcCertList));
+ CkmcCertList ckmcCertList = Marshal.PtrToStructure<CkmcCertList>(ptrCurr);
certs.Add(new Certificate(ckmcCertList.cert, false));
ptrCurr = ckmcCertList.next;
}
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
index 4e4ba5a..54d383b 100644..100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
@@ -29,7 +29,7 @@ namespace Tizen.Security.SecureRepository
if (ptrRawBuffer == IntPtr.Zero)
return;
- CkmcRawBuffer buff = (CkmcRawBuffer)Marshal.PtrToStructure(ptrRawBuffer, typeof(CkmcRawBuffer));
+ CkmcRawBuffer buff = Marshal.PtrToStructure<CkmcRawBuffer>(ptrRawBuffer);
byte[] data = new byte[buff.size];
Marshal.Copy(buff.data, data, 0, data.Length);