Skip to content

Commit

Permalink
Merge pull request #21 from SendSafely/v3.1.9
Browse files Browse the repository at this point in the history
v3.1.9
  • Loading branch information
SendSafely-GitHub authored Oct 9, 2023
2 parents 827e566 + 541118e commit 0986aff
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 7 deletions.
20 changes: 20 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright 2015-2023 SendSafely Inc.

The purpose of this NOTICE.txt file is to contain notices that are
required by the copyright owners of the incorporated third party components
noted and the respective licenses.
Some of the accompanying products have an attribution requirement
and are set forth below. Other accompanying products do not require
attribution, so are not listed. See also the LICENSE.txt file.


Apache Commons IO
Copyright 2002-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).


Google Gson
Copyright 2008-2011 Google Inc.
This product includes software developed by
Google Inc. (https://www.google.com/).
Binary file added SampleApplication/lib/commons-io-2.13.0.jar
Binary file not shown.
Binary file added SampleApplication/lib/gson-2.10.1.jar
Binary file not shown.
Binary file removed SampleApplication/lib/sendsafely-java-api-3.1.8.jar
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion SampleApplication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>com.sendsafely</groupId>
<artifactId>sendsafely-java-api</artifactId>
<version>3.1.8</version>
<version>3.1.9</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion SendSafelyAPI/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Use the following dependency in your project to grab via Maven:
<dependency>
<groupId>com.sendsafely</groupId>
<artifactId>sendsafely-java-api</artifactId>
<version>3.1.8</version>
<version>3.1.9</version>
</dependency>
```

Expand Down
Binary file added SendSafelyAPI/lib/commons-io-2.13.0.jar
Binary file not shown.
Binary file removed SendSafelyAPI/lib/commons-io-2.7.jar
Binary file not shown.
Binary file added SendSafelyAPI/lib/gson-2.10.1.jar
Binary file not shown.
Binary file removed SendSafelyAPI/lib/gson-2.8.9.jar
Binary file not shown.
Binary file removed SendSafelyAPI/lib/sendsafely-java-api-3.1.8.jar
Binary file not shown.
Binary file added SendSafelyAPI/lib/sendsafely-java-api-3.1.9.jar
Binary file not shown.
10 changes: 5 additions & 5 deletions SendSafelyAPI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma

<groupId>com.sendsafely</groupId>
<artifactId>sendsafely-java-api</artifactId>
<version>3.1.8</version>
<version>3.1.9</version>
<packaging>jar</packaging>

<name>SendSafely Java Client API</name>
Expand All @@ -15,8 +15,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

Expand Down Expand Up @@ -54,12 +54,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down
1 change: 1 addition & 0 deletions SendSafelyAPI/src/com/sendsafely/utils/CryptoUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ public static String encryptKeycode(String publicKeyStr, String keycode) throws

// create an encrypted payload and set the public key on the data generator
BcPGPDataEncryptorBuilder bcpgpdeb = new BcPGPDataEncryptorBuilder(PGPEncryptedData.AES_256);
bcpgpdeb.setWithIntegrityPacket(true);
PGPEncryptedDataGenerator encryptGen = new PGPEncryptedDataGenerator(bcpgpdeb);
encryptGen.addMethod(new BcPublicKeyKeyEncryptionMethodGenerator(key));

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 0986aff

Please sign in to comment.