Merge pull request #142 from Azure/dev

Fair Play 3.6.0.0 changes

.nuget/windowsazure.mediaservices.nuspec

@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
  <metadata>
  <id>windowsazure.mediaservices</id>
- <version>3.5.3.0</version>
+ <version>3.6.0.0</version>
  <title>Windows Azure Media Services .NET SDK</title>
  <authors>Microsoft Corporation</authors>
  <owners>Microsoft Corporation</owners>
  <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=272666&amp;clcid=0x409</licenseUrl>
  <projectUrl>http://aka.ms/wamsmsdn</projectUrl>
  <iconUrl>http://nimbuspmteam.blob.core.windows.net/nuget/Media Services 150.png</iconUrl>
  <requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>This package contains Windows Azure Media Service library 3.5.3.0 for .NET.</description>
+ <description>This package contains Windows Azure Media Service library 3.6.0.0 for .NET.</description>
  <releaseNotes>For more information, please check our forum: http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads
 
 For MSDN documentation please visit http://aka.ms/wamsmsdn

src/net/Client/Collections/ContentKeyBaseCollection.cs

@@ -19,6 +19,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Microsoft.WindowsAzure.MediaServices.Client.TransientFaultHandling;
@@ -36,16 +38,16 @@ public abstract class ContentKeyBaseCollection : CloudBaseCollection<IContentKey
  /// </summary>
  public const string ContentKeySet = "ContentKeys";
 
- /// <summary>
- /// Initializes a new instance of the <see cref="LocatorBaseCollection"/> class.
- /// </summary>
- /// <param name="cloudMediaContext">The <seealso cref="CloudMediaContext"/> instance.</param>
- [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ContentKeyBaseCollection"/> class.
+ /// </summary>
+ /// <param name="cloudMediaContext">The <seealso cref="CloudMediaContext"/> instance.</param>
+ [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors",
  Justification = "By design")]
  internal ContentKeyBaseCollection(MediaContextBase cloudMediaContext)
- : base(cloudMediaContext)
+ : base(cloudMediaContext)
  {
- this.Queryable = this.MediaContext.MediaServicesClassFactory.CreateDataServiceContext().CreateQuery<IContentKey, ContentKeyData>(ContentKeySet);
+ this.Queryable = this.MediaContext.MediaServicesClassFactory.CreateDataServiceContext().CreateQuery<IContentKey, ContentKeyData>(ContentKeySet);
  }
 
  /// <summary>
@@ -171,6 +173,61 @@ internal static ContentKeyData InitializeCommonContentKey(Guid keyId, byte[] con
  return contentKeyData;
  }
 
+ /// <summary>
+ /// Creates the FairPlay ASk.
+ /// </summary>
+ /// <param name="keyId">The key id.</param>
+ /// <param name="contentKey">The content key data.</param>
+ /// <param name="name">The name.</param>
+ /// <param name="cert">The cert.</param>
+ /// <returns>The content key.</returns>
+ internal static ContentKeyData InitializeFairPlayASk(Guid keyId, byte[] contentKey, string name, X509Certificate2 cert)
+ {
+ byte[] encryptedContentKey = CommonEncryption.EncryptContentKeyToCertificate(cert, contentKey);
+
+ ContentKeyData contentKeyData = new ContentKeyData
+ {
+ Id = EncryptionUtils.GetKeyIdentifierAsString(keyId),
+ EncryptedContentKey = Convert.ToBase64String(encryptedContentKey),
+ ContentKeyType = (int)ContentKeyType.FairPlayASk,
+ ProtectionKeyId = cert.Thumbprint,
+ ProtectionKeyType = (int)ProtectionKeyType.X509CertificateThumbprint,
+ Name = name,
+ Checksum = EncryptionUtils.CalculateChecksum(contentKey, keyId)
+ };
+
+ return contentKeyData;
+ }
+
+ /// <summary>
+ /// Creates FairPlay Pfx Password.
+ /// </summary>
+ /// <param name="keyId">The key id.</param>
+ /// <param name="contentKey">The content key data.</param>
+ /// <param name="name">The name.</param>
+ /// <param name="cert">The cert.</param>
+ /// <returns>The content key.</returns>
+ internal static ContentKeyData InitializeFairPlayPfxPassword(Guid keyId, byte[] contentKey, string name, X509Certificate2 cert)
+ {
+ RSACryptoServiceProvider rsaPublicKey = cert.PublicKey.Key as RSACryptoServiceProvider;
+
+ RSAOAEPKeyExchangeFormatter keyFormatter = new RSAOAEPKeyExchangeFormatter(rsaPublicKey);
+
+ byte[] encryptedContentKey = keyFormatter.CreateKeyExchange(contentKey);
+
+ ContentKeyData contentKeyData = new ContentKeyData
+ {
+ Id = EncryptionUtils.GetKeyIdentifierAsString(keyId),
+ EncryptedContentKey = Convert.ToBase64String(encryptedContentKey),
+ ContentKeyType = (int)ContentKeyType.FairPlayPfxPassword,
+ ProtectionKeyId = cert.Thumbprint,
+ ProtectionKeyType = (int)ProtectionKeyType.X509CertificateThumbprint,
+ Name = name,
+ };
+
+ return contentKeyData;
+ }
+
  /// <summary>
  /// Creates an envelope encryption content key.
  /// </summary>