Skip to content

Commit 5455940

Browse files
bump cryptolib to 2.1.0-rc1
1 parent 63bd437 commit 5455940

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<maven.compiler.release>17</maven.compiler.release>
1919

2020
<!-- dependencies -->
21-
<cryptolib.version>2.0.3</cryptolib.version>
21+
<cryptolib.version>2.1.0-rc1</cryptolib.version>
2222
<jwt.version>4.0.0</jwt.version>
2323
<dagger.version>2.44</dagger.version>
2424
<guava.version>31.1-jre</guava.version>

src/main/java/org/cryptomator/cryptofs/LongFileNameProvider.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ public String inflate(Path c9sPath) throws IOException {
8282
public DeflatedFileName deflate(Path c9rPath) {
8383
String longFileName = c9rPath.getFileName().toString();
8484
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+
}
9092
}
9193

9294
public static class DeflatedFileName {

src/main/java/org/cryptomator/cryptofs/health/shortened/ShortenedNamesCheck.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ enum SyntaxResult {
148148
//visible for testing
149149
String deflate(String longFileName) {
150150
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+
}
153155
}
154156

155157
}

src/main/java/org/cryptomator/cryptofs/migration/v7/FilePathMigration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,10 @@ String getNewDeflatedName() throws InvalidOldFilenameException {
232232
String inflatedName = getNewInflatedName();
233233
if (inflatedName.length() > SHORTENING_THRESHOLD) {
234234
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+
}
237239
} else {
238240
return inflatedName;
239241
}

0 commit comments

Comments
 (0)