Merge pull request #22 from ffleischer/master

Frank Laub · Frank Laub · commit c9a577e2d020 · 2015-06-19T12:20:06.000-07:00
fix EVP_PKEY_get1_EC_KEY
diff --git a/ManagedOpenSsl/Core/Native.cs b/ManagedOpenSsl/Core/Native.cs
@@ -1812,7 +1812,7 @@ public extern static int PEM_write_bio_PrivateKey(
 		public extern static int EVP_PKEY_set1_EC_KEY(IntPtr pkey, IntPtr key);
 
 		[DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
-		public extern static IntPtr EVP_PKEY_get1_EC(IntPtr pkey);
+		public extern static IntPtr EVP_PKEY_get1_EC_KEY(IntPtr pkey);
 
 		[DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
 		public extern static int EVP_PKEY_set1_DH(IntPtr pkey, IntPtr key);
diff --git a/ManagedOpenSsl/Crypto/CryptoKey.cs b/ManagedOpenSsl/Crypto/CryptoKey.cs
@@ -323,7 +323,7 @@ public EC.Key GetEC()
 			if (Type != KeyType.EC)
 				throw new InvalidOperationException();
 
-			return new EC.Key(Native.ExpectNonNull(Native.EVP_PKEY_get1_EC(ptr)), false);
+			return new EC.Key(Native.ExpectNonNull(Native.EVP_PKEY_get1_EC_KEY(ptr)), true);
 		}
 
 

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ public EC.Key GetEC()`
`323`	`323`	`if (Type != KeyType.EC)`
`324`	`324`	`throw new InvalidOperationException();`
`325`	`325`
`326`		`- return new EC.Key(Native.ExpectNonNull(Native.EVP_PKEY_get1_EC(ptr)), false);`
	`326`	`+ return new EC.Key(Native.ExpectNonNull(Native.EVP_PKEY_get1_EC_KEY(ptr)), true);`
`327`	`327`	`}`
`328`	`328`
`329`	`329`