Skip to content

Commit

Permalink
Support PKCS#11 for mutual TLS on Unix platforms (#184)
Browse files Browse the repository at this point in the history
- Update aws-crt-java to v0.15.8 (introduces PKCS#11 support)
- `AwsIotMqttConnectionBuilder` has new function for using PKCS#11
- Update docs
  • Loading branch information
graebm authored Oct 29, 2021
1 parent 3027ad4 commit a2fefee
Show file tree
Hide file tree
Showing 351 changed files with 77,622 additions and 28,120 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ mvn clean install
# NOTE: use the latest version of the CRT here


git clone --branch v0.14.0 https://github.com/awslabs/aws-crt-java.git
git clone --branch v0.15.8 https://github.com/awslabs/aws-crt-java.git

git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
cd aws-crt-java
Expand All @@ -80,7 +80,7 @@ Supports API 26 or newer.
NOTE: The shadow sample does not currently complete on android due to its dependence on stdin keyboard input.

``` sh
git clone --recursive --branch v0.14.0 https://github.com/awslabs/aws-crt-java.git
git clone --recursive --branch v0.15.8 https://github.com/awslabs/aws-crt-java.git
git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
cd aws-crt-java/android
./gradlew connectedCheck # optional, will run the unit tests on any connected devices/emulators
Expand All @@ -101,7 +101,7 @@ repositories {
}
dependencies {
implementation 'software.amazon.awssdk.crt:android:0.14.0'
implementation 'software.amazon.awssdk.crt:android:0.15.8'
}
```
#### Caution
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(":iotdevicesdk")
implementation 'software.amazon.awssdk.crt:android:0.14.0'
implementation 'software.amazon.awssdk.crt:android:0.15.8'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion android/iotdevicesdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ repositories {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'software.amazon.awssdk.crt:android:0.14.0'
implementation 'software.amazon.awssdk.crt:android:0.15.8'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
Expand Down
1 change: 0 additions & 1 deletion docs/_config.yml

This file was deleted.

276 changes: 0 additions & 276 deletions docs/allclasses-frame.html

This file was deleted.

1,232 changes: 1,232 additions & 0 deletions docs/allclasses-index.html

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions docs/allclasses-noframe.html → docs/allclasses.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE HTML>
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_292) on Tue Sep 07 15:32:11 PDT 2021 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- Generated by javadoc -->
<title>All Classes (AWS IoT Device SDK Java V2)</title>
<meta name="date" content="2021-09-07">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<main role="main" class="indexContainer">
<ul>
<li><a href="software/amazon/awssdk/eventstreamrpc/model/AccessDeniedException.html" title="class in software.amazon.awssdk.eventstreamrpc.model">AccessDeniedException</a></li>
<li><a href="software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.html" title="class in software.amazon.awssdk.iot">AwsIotMqttConnectionBuilder</a></li>
Expand Down Expand Up @@ -271,6 +278,6 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="software/amazon/awssdk/eventstreamrpc/model/ValidationException.html" title="class in software.amazon.awssdk.eventstreamrpc.model">ValidationException</a></li>
<li><a href="software/amazon/awssdk/eventstreamrpc/Version.html" title="class in software.amazon.awssdk.eventstreamrpc">Version</a></li>
</ul>
</div>
</main>
</body>
</html>
212 changes: 212 additions & 0 deletions docs/allpackages-index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
<!DOCTYPE HTML>
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc -->
<title>All Packages (AWS IoT Device SDK Java V2)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Packages (AWS IoT Device SDK Java V2)";
}
}
catch(err) {
}
//-->
var pathtoroot = "./";
var useModuleDirectories = true;
loadScripts(document, 'script');</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<header role="banner">
<nav role="navigation">
<div class="fixedNav">
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a id="navbar.top">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
<a id="navbar.top.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="index.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="index-all.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage">AWS IoT Device SDK Java V2 API Reference</div>
</div>
<div class="subNav">
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses.html">All&nbsp;Classes</a></li>
</ul>
<ul class="navListSearch">
<li><label for="search">SEARCH:</label>
<input type="text" id="search" value="search" disabled="disabled">
<input type="reset" id="reset" value="reset" disabled="disabled">
</li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_top");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a id="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
</div>
<div class="navPadding">&nbsp;</div>
<script type="text/javascript"><!--
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
//-->
</script>
</nav>
</header>
<main role="main">
<div class="header">
<h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
</div>
<div class="allPackagesContainer">
<ul class="blockList">
<li class="blockList">
<table class="packagesSummary">
<caption><span>Package Summary</span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Package</th>
<th class="colLast" scope="col">Description</th>
</tr>
<tbody>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/aws/greengrass/package-summary.html">software.amazon.awssdk.aws.greengrass</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/aws/greengrass/model/package-summary.html">software.amazon.awssdk.aws.greengrass.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/eventstreamrpc/package-summary.html">software.amazon.awssdk.eventstreamrpc</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/eventstreamrpc/model/package-summary.html">software.amazon.awssdk.eventstreamrpc.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/package-summary.html">software.amazon.awssdk.iot</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/discovery/package-summary.html">software.amazon.awssdk.iot.discovery</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/discovery/model/package-summary.html">software.amazon.awssdk.iot.discovery.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotidentity/package-summary.html">software.amazon.awssdk.iot.iotidentity</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotidentity/model/package-summary.html">software.amazon.awssdk.iot.iotidentity.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotjobs/package-summary.html">software.amazon.awssdk.iot.iotjobs</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotjobs/model/package-summary.html">software.amazon.awssdk.iot.iotjobs.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="rowColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotshadow/package-summary.html">software.amazon.awssdk.iot.iotshadow</a></th>
<td class="colLast">&nbsp;</td>
</tr>
<tr class="altColor">
<th class="colFirst" scope="row"><a href="software/amazon/awssdk/iot/iotshadow/model/package-summary.html">software.amazon.awssdk.iot.iotshadow.model</a></th>
<td class="colLast">&nbsp;</td>
</tr>
</tbody>
</table>
</li>
</ul>
</div>
</main>
<footer role="contentinfo">
<nav role="navigation">
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a id="navbar.bottom">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
<a id="navbar.bottom.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="index.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="index-all.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
<div class="aboutLanguage">AWS IoT Device SDK Java V2 API Reference</div>
</div>
<div class="subNav">
<ul class="navList" id="allclasses_navbar_bottom">
<li><a href="allclasses.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_bottom");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a id="skip.navbar.bottom">
<!-- -->
</a></div>
<!-- ======== END OF BOTTOM NAVBAR ======= -->
</nav>
<p class="legalCopy"><small>Copyright © 2021. All rights reserved.</small></p>
</footer>
</body>
</html>
Loading

0 comments on commit a2fefee

Please sign in to comment.