languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 22:19:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start using crypto 1.1.1 and tweak MD5 computation.

Browse source 
R=brianwilkerson@google.com, paulberry@google.com
BUG=

Review URL: https://codereview.chromium.org/2041963002 .
This commit is contained in:
Konstantin Shcheglov 2016-06-06 11:37:08 -07:00
parent e87a9c955c
commit e6d2b37065
2 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkg/analyzer/lib/src/summary/incremental_cache.dart
View file

@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:convert' show ChunkedConversionSink, UTF8;
import 'dart:convert';
import 'dart:core' hide Resource;
import 'package:analyzer/dart/element/element.dart';
@ -220,6 +220,21 @@ class IncrementalCache {
}
}
List<int> _computeSaltedMD5OfBytes(addData(ByteConversionSink byteSink)) {
Digest digest;
ChunkedConversionSink<Digest> digestSink =
new ChunkedConversionSink<Digest>.withCallback((List<Digest> digests) {
digest = digests.single;
});
ByteConversionSink byteSink = md5.startChunkedConversion(digestSink);
// Add data.
addData(byteSink);
byteSink.add(configSalt);
// Done.
byteSink.close();
return digest.bytes;
}
/**
* Get the content based information about the given [source], maybe `null`
* if the information is not in the cache.
@ -292,31 +307,12 @@ class IncrementalCache {
List<int> _getLibraryClosureHash(Source librarySource) {
return _libraryClosureHashMap.putIfAbsent(librarySource, () {
List<Source> closure = _getLibraryClosure(librarySource);
Digest digest;
var digestSink = new ChunkedConversionSink<Digest>.withCallback(
(List<Digest> digests) {
digest = digests.single;
return _computeSaltedMD5OfBytes((ByteConversionSink byteSink) {
for (Source source in closure) {
List<int> sourceHash = _getSourceContentHash(source);
byteSink.add(sourceHash);
}
});
var byteSink = md5.startChunkedConversion(digestSink);
for (Source source in closure) {
List<int> sourceHash = _getSourceContentHash(source);
byteSink.add(sourceHash);
}
byteSink.add(configSalt);
byteSink.close();
// TODO(paulberry): this call to `close` should not be needed.
// Can be removed once
// https://github.com/dart-lang/crypto/issues/33
// is fixed – ensure the min version constraint on crypto is updated, tho.
// Does not cause any problems in the mean time.
digestSink.close();
return digest.bytes;
});
}

2
pkg/analyzer/pubspec.yaml
View file

@ -7,7 +7,7 @@ environment:
sdk: '>=1.12.0 <2.0.0'
dependencies:
args: '>=0.12.1 <0.14.0'
crypto: '>=0.9.2 <2.0.0'
crypto: '>=1.1.1 <2.0.0'
glob: ^1.0.3
html: ^0.12.0
package_config: ^0.1.1