Author: yliu
Date: Tue Jul 22 08:38:38 2014
New Revision: 1612513
URL: http://svn.apache.org/r1612513
Log:
HADOOP-10853. Refactor get instance of CryptoCodec and support create via
algorithm/mode/padding. (yliu)
Modified:
hadoop/common/branches/fs-encryption/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
Modified:
hadoop/common/branches/fs-encryption/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java?rev=1612513&r1=1612512&r2=1612513&view=diff
==============================================================================
---
hadoop/common/branches/fs-encryption/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
(original)
+++
hadoop/common/branches/fs-encryption/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
Tue Jul 22 08:38:38 2014
@@ -1301,8 +1301,9 @@ public class DFSClient implements java.i
if (feInfo != null) {
// File is encrypted, wrap the stream in a crypto stream.
final CryptoInputStream cryptoIn =
- new CryptoInputStream(dfsis, codec,
- feInfo.getEncryptedDataEncryptionKey(), feInfo.getIV());
+ new CryptoInputStream(dfsis, CryptoCodec.getInstance(conf,
+ feInfo.getCipherSuite()), feInfo.getEncryptedDataEncryptionKey(),
+ feInfo.getIV());
return new HdfsDataInputStream(cryptoIn);
} else {
// No key/IV pair so no encryption.
