File tree Expand file tree Collapse file tree 4 files changed +16
-10
lines changed
src/main/java/org/cryptomator/cryptofs Expand file tree Collapse file tree 4 files changed +16
-10
lines changed Original file line number Diff line number Diff line change 18
18
<maven .compiler.release>17</maven .compiler.release>
19
19
20
20
<!-- dependencies -->
21
- <cryptolib .version>2.0.3 </cryptolib .version>
21
+ <cryptolib .version>2.1.0-rc1 </cryptolib .version>
22
22
<jwt .version>4.0.0</jwt .version>
23
23
<dagger .version>2.44</dagger .version>
24
24
<guava .version>31.1-jre</guava .version>
Original file line number Diff line number Diff line change @@ -82,11 +82,13 @@ public String inflate(Path c9sPath) throws IOException {
82
82
public DeflatedFileName deflate (Path c9rPath ) {
83
83
String longFileName = c9rPath .getFileName ().toString ();
84
84
byte [] longFileNameBytes = longFileName .getBytes (UTF_8 );
85
- byte [] hash = MessageDigestSupplier .SHA1 .get ().digest (longFileNameBytes );
86
- String shortName = BASE64 .encode (hash ) + DEFLATED_FILE_SUFFIX ;
87
- Path c9sPath = c9rPath .resolveSibling (shortName );
88
- longNames .put (c9sPath , longFileName );
89
- return new DeflatedFileName (c9sPath , longFileName , readonlyFlag );
85
+ try (var sha1 = MessageDigestSupplier .SHA1 .instance ()) {
86
+ byte [] hash = sha1 .get ().digest (longFileNameBytes );
87
+ String shortName = BASE64 .encode (hash ) + DEFLATED_FILE_SUFFIX ;
88
+ Path c9sPath = c9rPath .resolveSibling (shortName );
89
+ longNames .put (c9sPath , longFileName );
90
+ return new DeflatedFileName (c9sPath , longFileName , readonlyFlag );
91
+ }
90
92
}
91
93
92
94
public static class DeflatedFileName {
Original file line number Diff line number Diff line change @@ -148,8 +148,10 @@ enum SyntaxResult {
148
148
//visible for testing
149
149
String deflate (String longFileName ) {
150
150
byte [] longFileNameBytes = longFileName .getBytes (UTF_8 );
151
- byte [] hash = MessageDigestSupplier .SHA1 .get ().digest (longFileNameBytes );
152
- return BASE64URL .encode (hash ) + DEFLATED_FILE_SUFFIX ;
151
+ try (var sha1 = MessageDigestSupplier .SHA1 .instance ()) {
152
+ byte [] hash = sha1 .get ().digest (longFileNameBytes );
153
+ return BASE64URL .encode (hash ) + DEFLATED_FILE_SUFFIX ;
154
+ }
153
155
}
154
156
155
157
}
Original file line number Diff line number Diff line change @@ -232,8 +232,10 @@ String getNewDeflatedName() throws InvalidOldFilenameException {
232
232
String inflatedName = getNewInflatedName ();
233
233
if (inflatedName .length () > SHORTENING_THRESHOLD ) {
234
234
byte [] longFileNameBytes = inflatedName .getBytes (UTF_8 );
235
- byte [] hash = MessageDigestSupplier .SHA1 .get ().digest (longFileNameBytes );
236
- return BASE64 .encode (hash ) + NEW_SHORTENED_SUFFIX ;
235
+ try (var sha1 = MessageDigestSupplier .SHA1 .instance ()) {
236
+ byte [] hash = sha1 .get ().digest (longFileNameBytes );
237
+ return BASE64 .encode (hash ) + NEW_SHORTENED_SUFFIX ;
238
+ }
237
239
} else {
238
240
return inflatedName ;
239
241
}
You can’t perform that action at this time.
0 commit comments