Skip to content

Commit e058ef3

Browse files
authored
Merge pull request #21 from oracle/release_20170810
Releasing version 1.2.13
2 parents 2db1890 + 2d9a4d4 commit e058ef3

File tree

16 files changed

+103
-41
lines changed

16 files changed

+103
-41
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
1313
### Added
1414
- N/A
1515

16+
## 1.2.13 - 2017-08-10
17+
### Fixed
18+
- Duplicable stream support (https://github.com/oracle/bmcs-java-sdk/issues/11)
19+
- Fixed NullPointerException on invalid PEM key file
20+
1621
## 1.2.12 - 2017-07-20
1722
### Fixed
1823
- Reduced overhead in signing and serialization

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can find information on any known issues with the SDK [here](https://docs.us
4141

4242
## License
4343

44-
Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
44+
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
4545

4646
This SDK and sample is dual licensed under the Universal Permissive License 1.0 and the Apache License 2.0.
4747

bmc-audit/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.12</version>
8+
<version>1.2.13</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.bmc.sdk</groupId>
2020
<artifactId>oracle-bmc-java-sdk-common</artifactId>
21-
<version>1.2.12</version>
21+
<version>1.2.13</version>
2222
</dependency>
2323
</dependencies>
2424

bmc-bom/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.oracle.bmc.sdk</groupId>
99
<artifactId>oracle-bmc-java-sdk</artifactId>
10-
<version>1.2.12</version>
10+
<version>1.2.13</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.oracle.bmc.sdk</groupId>
2626
<artifactId>oracle-bmc-java-sdk-common</artifactId>
27-
<version>1.2.12</version>
27+
<version>1.2.13</version>
2828
<optional>false</optional>
2929
</dependency>
3030

@@ -33,31 +33,31 @@
3333
<dependency>
3434
<groupId>com.oracle.bmc.sdk</groupId>
3535
<artifactId>oracle-bmc-java-sdk-audit</artifactId>
36-
<version>1.2.12</version>
36+
<version>1.2.13</version>
3737
<optional>false</optional>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.oracle.bmc.sdk</groupId>
4141
<artifactId>oracle-bmc-java-sdk-core</artifactId>
42-
<version>1.2.12</version>
42+
<version>1.2.13</version>
4343
<optional>false</optional>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.oracle.bmc.sdk</groupId>
4747
<artifactId>oracle-bmc-java-sdk-identity</artifactId>
48-
<version>1.2.12</version>
48+
<version>1.2.13</version>
4949
<optional>false</optional>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.oracle.bmc.sdk</groupId>
5353
<artifactId>oracle-bmc-java-sdk-loadbalancer</artifactId>
54-
<version>1.2.12</version>
54+
<version>1.2.13</version>
5555
<optional>false</optional>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.oracle.bmc.sdk</groupId>
5959
<artifactId>oracle-bmc-java-sdk-objectstorage</artifactId>
60-
<version>1.2.12</version>
60+
<version>1.2.13</version>
6161
<optional>false</optional>
6262
</dependency>
6363
</dependencies>

bmc-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.12</version>
8+
<version>1.2.13</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,12 @@ public PEMFileRSAPrivateKeySupplier(
9090
} else if (object instanceof SubjectPublicKeyInfo) {
9191
throw new IllegalArgumentException(
9292
"Public key provided instead of private key");
93+
} else if (object != null) {
94+
throw new IllegalArgumentException(
95+
"Private key must be in PEM format, was: " + object.getClass());
9396
} else {
9497
throw new IllegalArgumentException(
95-
"Private key must be in PEM format: " + object.getClass());
98+
"Private key must be in PEM format");
9699
}
97100

98101
this.key = (RSAPrivateKey) converter.getPrivateKey(keyInfo);
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.oracle.bmc.http.signing.internal;
2+
3+
import org.junit.Test;
4+
5+
import java.io.ByteArrayInputStream;
6+
import java.io.InputStream;
7+
import java.io.IOException;
8+
import java.nio.file.Files;
9+
import java.nio.file.Path;
10+
11+
import static org.junit.Assert.fail;
12+
13+
/**
14+
* Tests for {@link PEMFileRSAPrivateKeySupplierTest}.
15+
*/
16+
public class PEMFileRSAPrivateKeySupplierTest {
17+
@Test(expected=IllegalArgumentException.class)
18+
public void ctor_invalidFile() throws IOException {
19+
InputStream notAPem = new ByteArrayInputStream(new byte[0]);
20+
// not a valid key file
21+
new PEMFileRSAPrivateKeySupplier(notAPem, null);
22+
fail("Should have thrown an IllegalArgumentException");
23+
}
24+
}

bmc-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.12</version>
8+
<version>1.2.13</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.bmc.sdk</groupId>
2020
<artifactId>oracle-bmc-java-sdk-common</artifactId>
21-
<version>1.2.12</version>
21+
<version>1.2.13</version>
2222
</dependency>
2323
</dependencies>
2424

bmc-examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.12</version>
8+
<version>1.2.13</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>com.oracle.bmc.sdk</groupId>
2121
<artifactId>oracle-bmc-java-sdk-bom</artifactId>
22-
<version>1.2.12</version>
22+
<version>1.2.13</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>

bmc-identity/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.12</version>
8+
<version>1.2.13</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.bmc.sdk</groupId>
2020
<artifactId>oracle-bmc-java-sdk-common</artifactId>
21-
<version>1.2.12</version>
21+
<version>1.2.13</version>
2222
</dependency>
2323
</dependencies>
2424

0 commit comments

Comments
 (0)