[2/2] brooklyn-ui git commit: This closes #111
This closes #111 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/13c56f07 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/13c56f07 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/13c56f07 Branch: refs/heads/master Commit: 13c56f078e599734ba50312e55ff452e083bb259 Parents: a9fcd52 8a82585 Author: Aled Sage Authored: Tue Nov 20 21:45:43 2018 + Committer: Aled Sage Committed: Tue Nov 20 21:45:43 2018 + -- .../spec-editor/spec-editor.directive.js| 23 +--- 1 file changed, 20 insertions(+), 3 deletions(-) --
[1/2] brooklyn-ui git commit: fix json editor state
Repository: brooklyn-ui
Updated Branches:
refs/heads/master a9fcd5276 -> 13c56f078
fix json editor state
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/8a82585b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/8a82585b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/8a82585b
Branch: refs/heads/master
Commit: 8a82585bcf4a402f6b935aca351880dd65819ead
Parents: 4093d1f
Author: Alex Heneveld
Authored: Tue Nov 20 13:35:07 2018 +
Committer: Alex Heneveld
Committed: Tue Nov 20 13:35:07 2018 +
--
.../spec-editor/spec-editor.directive.js| 23 +---
1 file changed, 20 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/8a82585b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
index 9c18129..ecfa249 100644
---
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
+++
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.directive.js
@@ -699,7 +699,24 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
// errors don't get stringified because model value was
not parsed
return value;
}
-return JSON.stringify(value);
+// if current local value gives same result then don't change
it
+// (don't interrupt user's flow, and respect their spacing, at
least until
+// they click away; ultimately we would like access to the
parse tree,
+// so we could take the text as entered exactly (maybe
stripping initial whitespace),
+// also supporting yaml and comments, but that is a bigger
task!)
+if (scope.config && typeof scope.config[key] === 'string') {
+try {
+if
(JSON.stringify(JSON.parse(scope.config[key]))===JSON.stringify(value)) {
+return scope.config[key];
+}
+} catch (ignoredError) {
+console.log("Couldn't handle entered JSON",
scope.config[key], ignoredError);
+}
+}
+// otherwise pretty print it, so they get decent multiline on
first load and
+// if they click off the entity then back on to the entity and
this field
+// (we'd like to respect what they actually typed but that
needs the parse tree, as above)
+return JSON.stringify(value, null, " ");
}
// else treat as value, with array/map special
@@ -737,8 +754,8 @@ export function specEditorDirective($rootScope,
$templateCache, $injector, $sani
scope.state.config.codeModeActive[key] = true;
// and the widget mode updated to be 'manual'
scope.getConfigWidgetMode(definition, value);
-
-return JSON.stringify(value);
+// and rerun this method so we get it prettified if appropriate
+return getLocalConfigValueFromModelValue(key, value);
}
// if boolean, return as primitive type
[3/5] brooklyn-ui git commit: address PR comments
address PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/176ab914
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/176ab914
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/176ab914
Branch: refs/heads/master
Commit: 176ab914c1c2da475f8ca8ebfd87756a6d1e13a1
Parents: abd5b43
Author: Alex Heneveld
Authored: Tue Nov 20 10:04:08 2018 +
Committer: Alex Heneveld
Committed: Tue Nov 20 10:04:08 2018 +
--
.../app/components/catalog-saver/catalog-saver.directive.js | 9 +
.../catalog-saver/catalog-saver.modal.template.html | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/176ab914/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
index adc3f42..435d758 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
@@ -44,7 +44,7 @@ const TYPES = [
angular.module(MODULE_NAME, [angularAnimate, uibModal, brUtils])
.directive('catalogSaver', ['$rootScope', '$uibModal', '$injector',
'$filter', 'composerOverrides', 'blueprintService',
saveToCatalogModalDirective])
.directive('catalogVersion', ['$parse', catalogVersionDirective])
-.directive('blueprintNameOrSymbolicNameAndBundleIdRequired',
blueprintNameOrSymbolicNameAndBundleIdRequiredDirective)
+.directive('composerBlueprintNameValidator',
composerBlueprintNameValidatorDirective)
.filter('bundlize', bundlizeProvider)
.run(['$templateCache', templateCache]);
@@ -210,7 +210,7 @@ export function CatalogItemModalController($scope, $filter,
blueprintService, pa
$scope.defaultSymbolicName = ($scope.config.itemType==='template' &&
$scope.config.original.symbolicName) || bundlize(newName) || null;
$scope.defaultBundle = ($scope.config.itemType==='template' &&
$scope.config.original.bundle) || bundlize(newName) || null;
};
-$scope.$watchGroup(['config.name', 'config.itemType'], (newVals) => {
+$scope.$watchGroup(['config.name', 'config.itemType', 'config.bundle',
'config.symbolicName'], (newVals) => {
$scope.updateDefaults(newVals[0]);
$scope.form.name.$validate();
$scope.buttonText = $scope.buttonTextFn();
@@ -218,13 +218,14 @@ export function CatalogItemModalController($scope,
$filter, blueprintService, pa
});
}
-function blueprintNameOrSymbolicNameAndBundleIdRequiredDirective() {
+function composerBlueprintNameValidatorDirective() {
return {
restrict: 'A',
require: 'ngModel',
link: function(scope, element, attr, ngModel) {
-ngModel.$validators.blueprintNameOrSymbolicNameAndBundleIdRequired
= function(modelValue, viewValue) {
+ngModel.$validators.composerBlueprintNameValidator =
function(modelValue, viewValue) {
scope.updateDefaults(modelValue);
+console.log("valildating", scope.config.bundle,
scope.config.symbolicName);
if (!ngModel.$isEmpty(modelValue)) {
// anything set is valid
return true;
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/176ab914/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
index 4b5f626..a0c9c2f 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
@@ -26,7 +26,7 @@
Blueprint display name
-
+
You must specify a name for
this item or supply explicit bundle ID and blueprint symbolic name
@@ -82,7 +82,7 @@
Application entity
+ uib-popover="Save as an application entity which
can be deployed on its own, or configured and used in blueprints but only
config and sensors declared at the root are accessible in the Composer
('application' item type)">
[4/5] brooklyn-ui git commit: more PR comments addressed
more PR comments addressed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/959ea3ac
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/959ea3ac
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/959ea3ac
Branch: refs/heads/master
Commit: 959ea3ac0e9e0a386b7dc427e21a7fe648d124b2
Parents: 176ab91
Author: Alex Heneveld
Authored: Tue Nov 20 10:17:18 2018 +
Committer: Alex Heneveld
Committed: Tue Nov 20 10:17:18 2018 +
--
.../app/components/catalog-saver/catalog-saver.modal.template.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/959ea3ac/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
index a0c9c2f..1fc7de9 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.modal.template.html
@@ -90,7 +90,7 @@
Application template
+ uib-popover="Save as a blueprint template which can
be used as an editable starting point for blueprints or used as an application
entity, and in some contexts this prioritizes the blueprint for inclusion in
quick-selection views ('template' item type)">
[2/5] brooklyn-ui git commit: use new icon url source
use new icon url source
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/abd5b435
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/abd5b435
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/abd5b435
Branch: refs/heads/master
Commit: abd5b435cd65b509fca801edf01142b6e6b9b97e
Parents: a552f04
Author: Alex Heneveld
Authored: Fri Nov 16 14:37:57 2018 +
Committer: Alex Heneveld
Committed: Fri Nov 16 14:37:57 2018 +
--
ui-modules/blueprint-composer/app/views/main/main.controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/abd5b435/ui-modules/blueprint-composer/app/views/main/main.controller.js
--
diff --git a/ui-modules/blueprint-composer/app/views/main/main.controller.js
b/ui-modules/blueprint-composer/app/views/main/main.controller.js
index bd0180f..87bf803 100644
--- a/ui-modules/blueprint-composer/app/views/main/main.controller.js
+++ b/ui-modules/blueprint-composer/app/views/main/main.controller.js
@@ -113,7 +113,7 @@ export function MainController($scope, $element, $log,
$state, $stateParams, brB
? 'application'
: 'entity',
description: edit.type.description,
-iconUrl: edit.type.iconUrl,
+iconUrl: edit.type.iconUrlSource || edit.type.iconUrl,
original: {
bundle: edit.bundle.symbolicName.replace(/^catalog-bom-/, ''),
symbolicName: edit.type.symbolicName,
[1/5] brooklyn-ui git commit: catalog saver to support 'application', 'template', and 'entity'
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 60ddc6213 -> a9fcd5276
catalog saver to support 'application', 'template', and 'entity'
in line with https://github.com/apache/brooklyn-server/pull/1015
also when using a template the metadata is not populated as the intention is
probably not to overwrite,
unless the user selects to save it as a template
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/a552f046
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/a552f046
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/a552f046
Branch: refs/heads/master
Commit: a552f04640459669cabdd5882b9e8964998b746e
Parents: 4093d1f
Author: Alex Heneveld
Authored: Fri Nov 16 13:42:17 2018 +
Committer: Alex Heneveld
Committed: Fri Nov 16 13:43:29 2018 +
--
.../catalog-saver/catalog-saver.directive.js| 121 +--
.../catalog-saver.modal.template.html | 26 ++--
.../app/views/main/main.controller.js | 25 +++-
3 files changed, 124 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/a552f046/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
index 252f6da..adc3f42 100644
---
a/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
+++
b/ui-modules/blueprint-composer/app/components/catalog-saver/catalog-saver.directive.js
@@ -42,14 +42,15 @@ const TYPES = [
];
angular.module(MODULE_NAME, [angularAnimate, uibModal, brUtils])
-.directive('catalogSaver', ['$rootScope', '$uibModal', '$injector',
'composerOverrides', 'blueprintService', saveToCatalogModalDirective])
+.directive('catalogSaver', ['$rootScope', '$uibModal', '$injector',
'$filter', 'composerOverrides', 'blueprintService',
saveToCatalogModalDirective])
.directive('catalogVersion', ['$parse', catalogVersionDirective])
+.directive('blueprintNameOrSymbolicNameAndBundleIdRequired',
blueprintNameOrSymbolicNameAndBundleIdRequiredDirective)
.filter('bundlize', bundlizeProvider)
.run(['$templateCache', templateCache]);
export default MODULE_NAME;
-export function saveToCatalogModalDirective($rootScope, $uibModal, $injector,
composerOverrides, blueprintService) {
+export function saveToCatalogModalDirective($rootScope, $uibModal, $injector,
$filter, composerOverrides, blueprintService) {
return {
restrict: 'E',
templateUrl: function (tElement, tAttrs) {
@@ -62,38 +63,50 @@ export function saveToCatalogModalDirective($rootScope,
$uibModal, $injector, co
};
function link($scope, $element) {
-$scope.buttonText = $scope.config.label || ($scope.config.itemType ?
`Update ${$scope.config.name || $scope.config.symbolicName}` : 'Add to
catalog');
-
+if (!$scope.config.original) {
+// original if provided contains the original metadata, e.g. for
use if coming from a template and switching between template and non-template
+$scope.config.original = {}
+}
+$scope.isNewFromTemplate = () => ($scope.config.itemType !==
'template' && $scope.config.original.itemType === 'template');
+$scope.isUpdate = () => !$scope.isNewFromTemplate() &&
Object.keys($scope.config.original).length>0;
+$scope.buttonTextFn = () => $scope.config.label || ($scope.isUpdate()
&& ($scope.config.name || $scope.config.original.name ||
$scope.config.symbolicName || $scope.config.original.symbolicName)) || 'Add to
catalog';
+$scope.buttonText = $scope.buttonTextFn();
+
$scope.activateModal = () => {
let entity = blueprintService.get();
let metadata = blueprintService.entityHasMetadata(entity) ?
blueprintService.getEntityMetadata(entity) : new Map();
-
-// Reset the config values if this is not an update
-$scope.isUpdate = Object.keys($scope.config).length >
($scope.config.label ? 1 : 0);
-if (!$scope.isUpdate) {
-$scope.config.itemType = 'template';
-}
-
-// Set various properties from the blueprint entity data
-if (!$scope.config.version && (entity.hasVersion() ||
metadata.has('version'))) {
-$scope.config.version = entity.version ||
metadata.get('version');
+
+if (!$scope.config.itemType) {
+// This is the default item type
+$scope.config.itemType = 'application';
}
+
[2/2] brooklyn-server git commit: This closes #1016
This closes #1016 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/57e7b1ac Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/57e7b1ac Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/57e7b1ac Branch: refs/heads/master Commit: 57e7b1ac31fba27ad3650b61702d1e8262af9a33 Parents: d0897b2 44b6e54 Author: Aled Sage Authored: Tue Nov 20 10:14:54 2018 + Committer: Aled Sage Committed: Tue Nov 20 10:14:54 2018 + -- .../org/apache/brooklyn/rest/transform/TypeTransformer.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) --
[1/2] brooklyn-server git commit: when editting it is useful to know the source URL
Repository: brooklyn-server
Updated Branches:
refs/heads/master d0897b2db -> 57e7b1ac3
when editting it is useful to know the source URL
this includes that in the payload if different
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/44b6e540
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/44b6e540
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/44b6e540
Branch: refs/heads/master
Commit: 44b6e540986a4ee26b47c075b7ebfe66585208fc
Parents: d0897b2
Author: Alex Heneveld
Authored: Fri Nov 16 14:34:39 2018 +
Committer: Alex Heneveld
Committed: Fri Nov 16 14:37:01 2018 +
--
.../org/apache/brooklyn/rest/transform/TypeTransformer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/44b6e540/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
--
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
index e8bfb50..2796acd 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
@@ -23,6 +23,7 @@ import static
org.apache.brooklyn.rest.util.WebResourceUtils.serviceUriBuilder;
import java.net.URI;
import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -87,7 +88,11 @@ public class TypeTransformer {
result.setExtraField("template", true);
}
if (item.getIconUrl()!=null) {
-result.setIconUrl(tidyIconLink(b, item, item.getIconUrl(), ub));
+String tidiedUrl = tidyIconLink(b, item, item.getIconUrl(), ub);
+result.setIconUrl(tidiedUrl);
+if (!Objects.equals(item.getIconUrl(), tidiedUrl)) {
+result.setExtraField("iconUrlSource", item.getIconUrl());
+}
}
if (detail) {
[1/2] brooklyn-ui git commit: add UI support for {required, forbidden}UnlessAnyOf, and simplify constraint messages
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 4093d1fd0 -> 60ddc6213
add UI support for {required,forbidden}UnlessAnyOf, and simplify constraint
messages
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/12871384
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/12871384
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/12871384
Branch: refs/heads/master
Commit: 12871384bd5b8d72e8467609abbf2d408a8dc225
Parents: 4093d1f
Author: Alex Heneveld
Authored: Tue Nov 20 02:16:28 2018 +
Committer: Alex Heneveld
Committed: Tue Nov 20 02:16:28 2018 +
--
.../providers/blueprint-service.provider.js | 22
1 file changed, 18 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/12871384/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
--
diff --git
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
index 0140faf..a896aac 100644
---
a/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
+++
b/ui-modules/blueprint-composer/app/components/providers/blueprint-service.provider.js
@@ -299,6 +299,10 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService)
}
let val = (k) => entity.config.get(k ||
config.name);
let isSet = (k) => entity.config.has(k ||
config.name) && angular.isDefined(val(k));
+let isAnySet = (k) => {
+if (!k || !Array.isArray(k)) return false;
+return k.some(isSet);
+}
let hasDefault = () =>
angular.isDefined(config.defaultValue);
switch (key) {
case 'Predicates.notNull()':
@@ -319,22 +323,32 @@ function BlueprintService($log, $q, $sce, paletteApi,
iconGenerator, dslService)
break;
case 'forbiddenIf':
if (isSet() && isSet(args)) {
-message = `${config.name}
cannot be set when ${args} is set`;
+message = `${config.name}
and ${args} cannot both be set`;
}
break;
case 'forbiddenUnless':
if (isSet() && !isSet(args)) {
-message = `${config.name}
cannot be set unless ${args} is set`;
+message = `${config.name}
can only be set when ${args} is set`;
}
break;
case 'requiredIf':
if (!isSet() && isSet(args)) {
-message = `${config.name}
is required when ${args} is set`;
+message = `${config.name}
must be set if ${args} is set`;
}
break;
case 'requiredUnless':
if (!isSet() && !isSet(args)) {
-message = `${config.name}
is required when ${args} is not set`;
+message = `${config.name}
or ${args} is required`;
+}
+break;
+case 'requiredUnlessAnyOf':
+if (!isSet() && !isAnySet(args)) {
+message = `${config.name}
or one of ${args} is required`;
+}
+break;
+case 'forbiddenUnlessAnyOf':
+if (isSet() && !isAnySet(args)) {
+message = `${config.name}
cannot be set if any of ${args} are set`;
}
break;
default:
[2/2] brooklyn-ui git commit: This closes #110
This closes #110 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/60ddc621 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/60ddc621 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/60ddc621 Branch: refs/heads/master Commit: 60ddc6213b045dac79ee148efc9c070b27d0a636 Parents: 4093d1f 1287138 Author: Thomas Bouron Authored: Tue Nov 20 09:48:12 2018 + Committer: Thomas Bouron Committed: Tue Nov 20 09:48:12 2018 + -- .../providers/blueprint-service.provider.js | 22 1 file changed, 18 insertions(+), 4 deletions(-) --
[11/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/openpgp/packet/signature.go
--
diff --git a/cli/vendor/golang.org/x/crypto/openpgp/packet/signature.go
b/cli/vendor/golang.org/x/crypto/openpgp/packet/signature.go
deleted file mode 100644
index 1f29d3d..000
--- a/cli/vendor/golang.org/x/crypto/openpgp/packet/signature.go
+++ /dev/null
@@ -1,699 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
- "bytes"
- "crypto"
- "crypto/dsa"
- "crypto/rsa"
- "encoding/binary"
- "hash"
- "io"
- "strconv"
- "time"
-
- "golang.org/x/crypto/openpgp/errors"
- "golang.org/x/crypto/openpgp/s2k"
-)
-
-const (
- // See RFC 4880, section 5.2.3.21 for details.
- KeyFlagCertify = 1 << iota
- KeyFlagSign
- KeyFlagEncryptCommunications
- KeyFlagEncryptStorage
-)
-
-// Signature represents a signature. See RFC 4880, section 5.2.
-type Signature struct {
- SigTypeSignatureType
- PubKeyAlgo PublicKeyAlgorithm
- Hash crypto.Hash
-
- // HashSuffix is extra data that is hashed in after the signed data.
- HashSuffix []byte
- // HashTag contains the first two bytes of the hash for fast rejection
- // of bad signed data.
- HashTag [2]byte
- CreationTime time.Time
-
- RSASignature parsedMPI
- DSASigR, DSASigS parsedMPI
- ECDSASigR, ECDSASigS parsedMPI
-
- // rawSubpackets contains the unparsed subpackets, in order.
- rawSubpackets []outputSubpacket
-
- // The following are optional so are nil when not included in the
- // signature.
-
- SigLifetimeSecs, KeyLifetimeSecs*uint32
- PreferredSymmetric, PreferredHash, PreferredCompression []uint8
- IssuerKeyId *uint64
- IsPrimaryId *bool
-
- // FlagsValid is set if any flags were given. See RFC 4880, section
- // 5.2.3.21 for details.
- FlagsValid
bool
- FlagCertify, FlagSign, FlagEncryptCommunications, FlagEncryptStorage
bool
-
- // RevocationReason is set if this signature has been revoked.
- // See RFC 4880, section 5.2.3.23 for details.
- RevocationReason *uint8
- RevocationReasonText string
-
- // MDC is set if this signature has a feature packet that indicates
- // support for MDC subpackets.
- MDC bool
-
- // EmbeddedSignature, if non-nil, is a signature of the parent key, by
- // this key. This prevents an attacker from claiming another's signing
- // subkey as their own.
- EmbeddedSignature *Signature
-
- outSubpackets []outputSubpacket
-}
-
-func (sig *Signature) parse(r io.Reader) (err error) {
- // RFC 4880, section 5.2.3
- var buf [5]byte
- _, err = readFull(r, buf[:1])
- if err != nil {
- return
- }
- if buf[0] != 4 {
- err = errors.UnsupportedError("signature packet version " +
strconv.Itoa(int(buf[0])))
- return
- }
-
- _, err = readFull(r, buf[:5])
- if err != nil {
- return
- }
- sig.SigType = SignatureType(buf[0])
- sig.PubKeyAlgo = PublicKeyAlgorithm(buf[1])
- switch sig.PubKeyAlgo {
- case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA,
PubKeyAlgoECDSA:
- default:
- err = errors.UnsupportedError("public key algorithm " +
strconv.Itoa(int(sig.PubKeyAlgo)))
- return
- }
-
- var ok bool
- sig.Hash, ok = s2k.HashIdToHash(buf[2])
- if !ok {
- return errors.UnsupportedError("hash function " +
strconv.Itoa(int(buf[2])))
- }
-
- hashedSubpacketsLength := int(buf[3])<<8 | int(buf[4])
- l := 6 + hashedSubpacketsLength
- sig.HashSuffix = make([]byte, l+6)
- sig.HashSuffix[0] = 4
- copy(sig.HashSuffix[1:], buf[:5])
- hashedSubpackets := sig.HashSuffix[6:l]
- _, err = readFull(r, hashedSubpackets)
- if err != nil {
- return
- }
- // See RFC 4880, section 5.2.4
- trailer := sig.HashSuffix[l:]
- trailer[0] = 4
- trailer[1] = 0xff
- trailer[2] = uint8(l >> 24)
- trailer[3] = uint8(l >> 16)
- trailer[4] = uint8(l >> 8)
- trailer[5] = uint8(l)
-
- err = parseSignatureSubpackets(sig, hashedSubpackets, true)
- if err != nil {
- return
- }
-
- _, err = readFull(r, buf[:2])
- if err != nil {
- return
- }
-
[14/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ocsp/ocsp.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ocsp/ocsp.go
b/cli/vendor/golang.org/x/crypto/ocsp/ocsp.go
deleted file mode 100644
index ea61cf4..000
--- a/cli/vendor/golang.org/x/crypto/ocsp/ocsp.go
+++ /dev/null
@@ -1,673 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ocsp parses OCSP responses as specified in RFC 2560. OCSP responses
-// are signed messages attesting to the validity of a certificate for a small
-// period of time. This is used to manage revocation for X.509 certificates.
-package ocsp // import "golang.org/x/crypto/ocsp"
-
-import (
- "crypto"
- "crypto/ecdsa"
- "crypto/elliptic"
- "crypto/rand"
- "crypto/rsa"
- "crypto/sha1"
- "crypto/x509"
- "crypto/x509/pkix"
- "encoding/asn1"
- "errors"
- "math/big"
- "strconv"
- "time"
-)
-
-var idPKIXOCSPBasic = asn1.ObjectIdentifier([]int{1, 3, 6, 1, 5, 5, 7, 48, 1,
1})
-
-// ResponseStatus contains the result of an OCSP request. See
-// https://tools.ietf.org/html/rfc6960#section-2.3
-type ResponseStatus int
-
-const (
- Success ResponseStatus = 0
- Malformed ResponseStatus = 1
- InternalError ResponseStatus = 2
- TryLater ResponseStatus = 3
- // Status code four is ununsed in OCSP. See
- // https://tools.ietf.org/html/rfc6960#section-4.2.1
- SignatureRequired ResponseStatus = 5
- Unauthorized ResponseStatus = 6
-)
-
-func (r ResponseStatus) String() string {
- switch r {
- case Success:
- return "success"
- case Malformed:
- return "malformed"
- case InternalError:
- return "internal error"
- case TryLater:
- return "try later"
- case SignatureRequired:
- return "signature required"
- case Unauthorized:
- return "unauthorized"
- default:
- return "unknown OCSP status: " + strconv.Itoa(int(r))
- }
-}
-
-// ResponseError is an error that may be returned by ParseResponse to indicate
-// that the response itself is an error, not just that its indicating that a
-// certificate is revoked, unknown, etc.
-type ResponseError struct {
- Status ResponseStatus
-}
-
-func (r ResponseError) Error() string {
- return "ocsp: error from server: " + r.Status.String()
-}
-
-// These are internal structures that reflect the ASN.1 structure of an OCSP
-// response. See RFC 2560, section 4.2.
-
-type certID struct {
- HashAlgorithm pkix.AlgorithmIdentifier
- NameHash []byte
- IssuerKeyHash []byte
- SerialNumber *big.Int
-}
-
-// https://tools.ietf.org/html/rfc2560#section-4.1.1
-type ocspRequest struct {
- TBSRequest tbsRequest
-}
-
-type tbsRequest struct {
- Version int
`asn1:"explicit,tag:0,default:0,optional"`
- RequestorName pkix.RDNSequence `asn1:"explicit,tag:1,optional"`
- RequestList []request
-}
-
-type request struct {
- Cert certID
-}
-
-type responseASN1 struct {
- Status asn1.Enumerated
- Response responseBytes `asn1:"explicit,tag:0,optional"`
-}
-
-type responseBytes struct {
- ResponseType asn1.ObjectIdentifier
- Response []byte
-}
-
-type basicResponse struct {
- TBSResponseDataresponseData
- SignatureAlgorithm pkix.AlgorithmIdentifier
- Signature asn1.BitString
- Certificates []asn1.RawValue `asn1:"explicit,tag:0,optional"`
-}
-
-type responseData struct {
- Raw asn1.RawContent
- Version int
`asn1:"optional,default:1,explicit,tag:0"`
- RawResponderName asn1.RawValue `asn1:"optional,explicit,tag:1"`
- KeyHash []byte`asn1:"optional,explicit,tag:2"`
- ProducedAt time.Time `asn1:"generalized"`
- Responses[]singleResponse
-}
-
-type singleResponse struct {
- CertID certID
- Good asn1.Flag`asn1:"tag:0,optional"`
- Revoked revokedInfo `asn1:"tag:1,optional"`
- Unknown asn1.Flag`asn1:"tag:2,optional"`
- ThisUpdate time.Time`asn1:"generalized"`
- NextUpdate time.Time
`asn1:"generalized,explicit,tag:0,optional"`
- SingleExtensions []pkix.Extension `asn1:"explicit,tag:1,optional"`
-}
-
-type revokedInfo struct {
- RevocationTime time.Time `asn1:"generalized"`
- Reason asn1.Enumerated `asn1:"explicit,tag:0,optional"`
-}
-
-var (
- oidSignatureMD2WithRSA = asn1.ObjectIdentifier{1, 2, 840, 113549,
1, 1,
[19/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/github.com/NodePrime/jsonpath/lexer_test.go
--
diff --git a/cli/vendor/github.com/NodePrime/jsonpath/lexer_test.go
b/cli/vendor/github.com/NodePrime/jsonpath/lexer_test.go
deleted file mode 100644
index 6627f76..000
--- a/cli/vendor/github.com/NodePrime/jsonpath/lexer_test.go
+++ /dev/null
@@ -1,309 +0,0 @@
-package jsonpath
-
-import (
- "bytes"
- "encoding/json"
- "fmt"
- "io/ioutil"
- "math"
- "os"
- "strings"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func testLexerMethods(l lexer, as *assert.Assertions) {
- s := l.peek()
- as.EqualValues('{', s, "First rune should match")
- r := l.take()
- as.EqualValues('{', r, "First rune should match")
- r = l.take()
- as.EqualValues('"', r, "Second rune should match")
- r = l.take()
- as.EqualValues('k', r, "Third rune should match")
- // Try peeking
- r = l.peek()
- as.EqualValues('e', r, "Peek fifth rune should match")
- // Second peek should yield same result
- r = l.peek()
- as.EqualValues('e', r, "Peek fifth rune should match")
- r = l.take()
- // Taking should yield peeked result
- as.EqualValues('e', r, "Rune should match")
- // Taking should yield next result
- r = l.take()
- as.EqualValues('y', r, "Rune should match")
- r = l.take()
- as.EqualValues('"', r, "Rune should match")
- r = l.peek()
- as.EqualValues(' ', r, "Rune should match")
-
- l.take()
- l.ignore()
-
- r = l.peek()
- as.EqualValues(':', r, "Rune should match")
-}
-
-func TestLexerMethods(t *testing.T) {
- as := assert.New(t)
- input := `{"key" :"value"}`
-
- sl := NewSliceLexer([]byte(input), JSON)
- testLexerMethods(sl, as)
-
- r := strings.NewReader(input)
- rl := NewReaderLexer(r, JSON)
- testLexerMethods(rl, as)
-}
-
-const (
- sampleMix = `{"Type":"inventory.all","Id":1, "Digest":
"f0e8ff11922e2e988ad8a68e99dbd055be7445ee", "NodeID":
"588be7c36150f57babf564e1a25ea1c1", "Content": {"sysinfo.package":
{"Entries":[{"Category":"RPM_Packages","Details":[{"Tag":"Name","Value":"initscripts"},{"Tag":"Summary","Value":"The
inittab file and the /etc/init.d
scripts"},{"Tag":"Version","Value":"9.03.40"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"5720353"},{"Tag":"InstallTime","Value":"1412965846"},{"Tag":"Name","Value":"setup"},{"Tag":"Summary","Value":"A
set of system configuration and setup
files"},{"Tag":"Version","Value":"2.8.14"},{"Tag":"Arch","Value":"noarch"},{"Tag":"Size","Value":"666477"},{"Tag":"InstallTime","Value":"1412965633"},{"Tag":"Name","Value":"dracut"},{"Tag":"Summary","Value":"Initramfs
generator using
udev"},{"Tag":"Version","Value":"004"},{"Tag":"Arch","Value":"noarch"},{"Tag":"Size","Value":"257710"},{"Tag":"InstallTime","Value":"1412965847"},{"Tag":"Name","Value":"basesystem"
},{"Tag":"Summary","Value":"The skeleton package which defines a simple Red
Hat Enterprise Linux
system"},{"Tag":"Version","Value":"10.0"},{"Tag":"Arch","Value":"noarch"},{"Tag":"Size","Value":"0"},{"Tag":"InstallTime","Value":"1412965634"},{"Tag":"Name","Value":"kernel"},{"Tag":"Summary","Value":"The
Linux
kernel"},{"Tag":"Version","Value":"2.6.32"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"126773875"},{"Tag":"InstallTime","Value":"1412965853"},{"Tag":"Name","Value":"e2fsprogs"},{"Tag":"Summary","Value":"Utilities
for managing ext2, ext3, and ext4
filesystems"},{"Tag":"Version","Value":"1.41.12"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"2020232"},{"Tag":"InstallTime","Value":"1412965856"},{"Tag":"Name","Value":"curl"},{"Tag":"Summary","Value":"A
utility for getting files from remote servers (FTP, HTTP, and
others)"},{"Tag":"Version","Value":"7.19.7"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"355395"},{"Tag":"InstallTime","Value":"1412965888"}
,{"Tag":"Name","Value":"ncurses-libs"},{"Tag":"Summary","Value":"Ncurses
libraries"},{"Tag":"Version","Value":"5.7"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"760448"},{"Tag":"InstallTime","Value":"1412965644"},{"Tag":"Name","Value":"audit"},{"Tag":"Summary","Value":"User
space tools for 2.6 kernel
auditing"},{"Tag":"Version","Value":"2.2"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"979444"},{"Tag":"InstallTime","Value":"1412965889"},{"Tag":"Name","Value":"libattr"},{"Tag":"Summary","Value":"Dynamic
library for extended attribute
support"},{"Tag":"Version","Value":"2.4.44"},{"Tag":"Arch","Value":"x86_64"},{"Tag":"Size","Value":"18712"},{"Tag":"InstallTime","Value":"1412965644"},{"Tag":"Name","Value":"ql2400-firmware"},{"Tag":"Summary","Value":"Firmware
for qlogic 2400
[13/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
--
diff --git a/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
b/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
deleted file mode 100644
index 73f4fe3..000
--- a/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package elgamal implements ElGamal encryption, suitable for OpenPGP,
-// as specified in "A Public-Key Cryptosystem and a Signature Scheme Based on
-// Discrete Logarithms," IEEE Transactions on Information Theory, v. IT-31,
-// n. 4, 1985, pp. 469-472.
-//
-// This form of ElGamal embeds PKCS#1 v1.5 padding, which may make it
-// unsuitable for other protocols. RSA should be used in preference in any
-// case.
-package elgamal // import "golang.org/x/crypto/openpgp/elgamal"
-
-import (
- "crypto/rand"
- "crypto/subtle"
- "errors"
- "io"
- "math/big"
-)
-
-// PublicKey represents an ElGamal public key.
-type PublicKey struct {
- G, P, Y *big.Int
-}
-
-// PrivateKey represents an ElGamal private key.
-type PrivateKey struct {
- PublicKey
- X *big.Int
-}
-
-// Encrypt encrypts the given message to the given public key. The result is a
-// pair of integers. Errors can result from reading random, or because msg is
-// too large to be encrypted to the public key.
-func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int,
err error) {
- pLen := (pub.P.BitLen() + 7) / 8
- if len(msg) > pLen-11 {
- err = errors.New("elgamal: message too long")
- return
- }
-
- // EM = 0x02 || PS || 0x00 || M
- em := make([]byte, pLen-1)
- em[0] = 2
- ps, mm := em[1:len(em)-len(msg)-1], em[len(em)-len(msg):]
- err = nonZeroRandomBytes(ps, random)
- if err != nil {
- return
- }
- em[len(em)-len(msg)-1] = 0
- copy(mm, msg)
-
- m := new(big.Int).SetBytes(em)
-
- k, err := rand.Int(random, pub.P)
- if err != nil {
- return
- }
-
- c1 = new(big.Int).Exp(pub.G, k, pub.P)
- s := new(big.Int).Exp(pub.Y, k, pub.P)
- c2 = s.Mul(s, m)
- c2.Mod(c2, pub.P)
-
- return
-}
-
-// Decrypt takes two integers, resulting from an ElGamal encryption, and
-// returns the plaintext of the message. An error can result only if the
-// ciphertext is invalid. Users should keep in mind that this is a padding
-// oracle and thus, if exposed to an adaptive chosen ciphertext attack, can
-// be used to break the cryptosystem. See ``Chosen Ciphertext Attacks
-// Against Protocols Based on the RSA Encryption Standard PKCS #1'', Daniel
-// Bleichenbacher, Advances in Cryptology (Crypto '98),
-func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) {
- s := new(big.Int).Exp(c1, priv.X, priv.P)
- s.ModInverse(s, priv.P)
- s.Mul(s, c2)
- s.Mod(s, priv.P)
- em := s.Bytes()
-
- firstByteIsTwo := subtle.ConstantTimeByteEq(em[0], 2)
-
- // The remainder of the plaintext must be a string of non-zero random
- // octets, followed by a 0, followed by the message.
- // lookingForIndex: 1 iff we are still looking for the zero.
- // index: the offset of the first zero byte.
- var lookingForIndex, index int
- lookingForIndex = 1
-
- for i := 1; i < len(em); i++ {
- equals0 := subtle.ConstantTimeByteEq(em[i], 0)
- index = subtle.ConstantTimeSelect(lookingForIndex, i,
index)
- lookingForIndex = subtle.ConstantTimeSelect(equals0, 0,
lookingForIndex)
- }
-
- if firstByteIsTwo != 1 || lookingForIndex != 0 || index < 9 {
- return nil, errors.New("elgamal: decryption error")
- }
- return em[index+1:], nil
-}
-
-// nonZeroRandomBytes fills the given slice with non-zero random octets.
-func nonZeroRandomBytes(s []byte, rand io.Reader) (err error) {
- _, err = io.ReadFull(rand, s)
- if err != nil {
- return
- }
-
- for i := 0; i < len(s); i++ {
- for s[i] == 0 {
- _, err = io.ReadFull(rand, s[i:i+1])
- if err != nil {
- return
- }
- }
- }
-
- return
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal_test.go
[17/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
b/cli/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
deleted file mode 100644
index 7afa1fd..000
--- a/cli/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blowfish
-
-import "testing"
-
-type CryptTest struct {
- key []byte
- in []byte
- out []byte
-}
-
-// Test vector values are from http://www.schneier.com/code/vectors.txt.
-var encryptTests = []CryptTest{
- {
- []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- []byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
- {
- []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
- []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
- []byte{0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A}},
- {
- []byte{0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- []byte{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
- []byte{0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2}},
- {
- []byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
- []byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
- []byte{0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D}},
-
- {
- []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
- []byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
- []byte{0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96}},
- {
- []byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
- []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
- []byte{0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7}},
- {
- []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- []byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
- {
- []byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
- []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
- []byte{0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D}},
- {
- []byte{0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
- []byte{0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
- []byte{0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B}},
- {
- []byte{0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
- []byte{0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
- []byte{0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0}},
- {
- []byte{0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
- []byte{0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
- []byte{0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4}},
- {
- []byte{0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
- []byte{0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
- []byte{0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB}},
- {
- []byte{0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
- []byte{0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
- []byte{0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A}},
- {
- []byte{0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
- []byte{0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
- []byte{0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18}},
- {
- []byte{0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
- []byte{0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
- []byte{0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98}},
- {
- []byte{0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
- []byte{0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
- []byte{0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5}},
- {
- []byte{0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
- []byte{0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
- []byte{0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79}},
- {
- []byte{0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
- []byte{0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
- []byte{0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3}},
- {
- []byte{0x37,
[18/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/github.com/NodePrime/jsonpath/path_states_test.go
--
diff --git a/cli/vendor/github.com/NodePrime/jsonpath/path_states_test.go
b/cli/vendor/github.com/NodePrime/jsonpath/path_states_test.go
deleted file mode 100644
index 42d5b41..000
--- a/cli/vendor/github.com/NodePrime/jsonpath/path_states_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package jsonpath
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-var pathTests = []lexTest{
- {"simple root node", `$.akey`, []int{pathRoot, pathPeriod, pathKey,
pathEOF}},
- {"simple current node", `@.akey`, []int{pathCurrent, pathPeriod,
pathKey, pathEOF}},
- {"simple root node w/ value", `$.akey+`, []int{pathRoot, pathPeriod,
pathKey, pathValue, pathEOF}},
- {"nested object", `$.akey.akey2`, []int{pathRoot, pathPeriod, pathKey,
pathPeriod, pathKey, pathEOF}},
- {"nested objects", `$.akey.akey2.akey3`, []int{pathRoot, pathPeriod,
pathKey, pathPeriod, pathKey, pathPeriod, pathKey, pathEOF}},
- {"quoted keys", `$.akey["akey2"].akey3`, []int{pathRoot, pathPeriod,
pathKey, pathBracketLeft, pathKey, pathBracketRight, pathPeriod, pathKey,
pathEOF}},
- {"wildcard key", `$.akey.*.akey3`, []int{pathRoot, pathPeriod, pathKey,
pathPeriod, pathWildcard, pathPeriod, pathKey, pathEOF}},
- {"wildcard index", `$.akey[*]`, []int{pathRoot, pathPeriod, pathKey,
pathBracketLeft, pathWildcard, pathBracketRight, pathEOF}},
- {"key with where expression", `$.akey?(@.ten = 5)`, []int{pathRoot,
pathPeriod, pathKey, pathWhere, pathExpression, pathEOF}},
- {"bracket notation", `$["aKey"][*][32][23:42]`, []int{pathRoot,
pathBracketLeft, pathKey, pathBracketRight, pathBracketLeft, pathWildcard,
pathBracketRight, pathBracketLeft, pathIndex, pathBracketRight,
pathBracketLeft, pathIndex, pathIndexRange, pathIndex, pathBracketRight,
pathEOF}},
-}
-
-func TestValidPaths(t *testing.T) {
- as := assert.New(t)
- for _, test := range pathTests {
- lexer := NewSliceLexer([]byte(test.input), PATH)
- types := itemsToTypes(readerToArray(lexer))
-
- as.EqualValues(types, test.tokenTypes, "Testing of %s:
\nactual\n\t%+v\nexpected\n\t%v", test.name, typesDescription(types,
pathTokenNames), typesDescription(test.tokenTypes, pathTokenNames))
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/github.com/NodePrime/jsonpath/path_test.go
--
diff --git a/cli/vendor/github.com/NodePrime/jsonpath/path_test.go
b/cli/vendor/github.com/NodePrime/jsonpath/path_test.go
deleted file mode 100644
index ab7f2a2..000
--- a/cli/vendor/github.com/NodePrime/jsonpath/path_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package jsonpath
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-type optest struct {
- name string
- path string
- expected []int
-}
-
-var optests = []optest{
- optest{"single key (period) ", `$.aKey`, []int{opTypeName}},
- optest{"single key (bracket)", `$["aKey"]`, []int{opTypeName}},
- optest{"single key (period) ", `$.*`, []int{opTypeNameWild}},
- optest{"single index", `$[12]`, []int{opTypeIndex}},
- optest{"single key", `$[23:45]`, []int{opTypeIndexRange}},
- optest{"single key", `$[*]`, []int{opTypeIndexWild}},
-
- optest{"double key", `$["aKey"]["bKey"]`, []int{opTypeName,
opTypeName}},
- optest{"double key", `$["aKey"].bKey`, []int{opTypeName, opTypeName}},
-}
-
-func TestQueryOperators(t *testing.T) {
- as := assert.New(t)
-
- for _, t := range optests {
- path, err := parsePath(t.path)
- as.NoError(err)
-
- as.EqualValues(len(t.expected), len(path.operators))
-
- for x, op := range t.expected {
- as.EqualValues(pathTokenNames[op],
pathTokenNames[path.operators[x].typ])
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/github.com/NodePrime/jsonpath/stack_test.go
--
diff --git a/cli/vendor/github.com/NodePrime/jsonpath/stack_test.go
b/cli/vendor/github.com/NodePrime/jsonpath/stack_test.go
deleted file mode 100644
index d1b1d2f..000
--- a/cli/vendor/github.com/NodePrime/jsonpath/stack_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package jsonpath
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestStackPush(t *testing.T) {
- as := assert.New(t)
- s := newIntStack()
-
- s.push(5)
- as.EqualValues(s.len(), 1)
-
- s.push(12)
- as.EqualValues(s.len(), 2)
-}
-
-func TestStackPop(t *testing.T) {
- as :=
[20/21] brooklyn-client git commit: Switch to dep for dependency management
Switch to dep for dependency management Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/868863aa Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/868863aa Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/868863aa Branch: refs/heads/master Commit: 868863aa166e9ac90391fcd405f891c7c645b658 Parents: d8ef284 Author: Geoff Macartney Authored: Sat Nov 17 22:49:20 2018 + Committer: Geoff Macartney Committed: Sun Nov 18 23:42:44 2018 + -- cli/Gopkg.lock | 37 + cli/Gopkg.toml | 28 + cli/README.md |4 +- cli/glide.lock | 15 - cli/glide.yaml |9 - cli/pom.xml |3 +- cli/release/build.sh|1 - .../NodePrime/jsonpath/cli/jsonpath/main.go | 94 -- .../github.com/NodePrime/jsonpath/eval_test.go | 101 -- .../jsonpath/expression_states_test.go | 40 - .../NodePrime/jsonpath/expression_test.go | 226 --- .../NodePrime/jsonpath/json_states_test.go | 172 -- .../github.com/NodePrime/jsonpath/lexer_test.go | 309 .../NodePrime/jsonpath/path_states_test.go | 30 - .../github.com/NodePrime/jsonpath/path_test.go | 40 - .../github.com/NodePrime/jsonpath/stack_test.go | 56 - cli/vendor/github.com/urfave/cli/app_test.go| 1047 .../urfave/cli/autocomplete/bash_autocomplete | 14 - .../urfave/cli/autocomplete/zsh_autocomplete|5 - .../github.com/urfave/cli/command_test.go | 97 -- .../github.com/urfave/cli/context_test.go | 113 -- cli/vendor/github.com/urfave/cli/flag_test.go | 859 -- cli/vendor/github.com/urfave/cli/help_test.go | 94 -- .../github.com/urfave/cli/helpers_test.go | 19 - cli/vendor/golang.org/x/crypto/.gitattributes | 10 - cli/vendor/golang.org/x/crypto/.gitignore |2 - cli/vendor/golang.org/x/crypto/CONTRIBUTING.md | 31 - cli/vendor/golang.org/x/crypto/README |3 - cli/vendor/golang.org/x/crypto/bcrypt/base64.go | 35 - cli/vendor/golang.org/x/crypto/bcrypt/bcrypt.go | 294 .../golang.org/x/crypto/bcrypt/bcrypt_test.go | 226 --- .../golang.org/x/crypto/blowfish/block.go | 159 -- .../x/crypto/blowfish/blowfish_test.go | 274 .../golang.org/x/crypto/blowfish/cipher.go | 91 -- .../golang.org/x/crypto/blowfish/const.go | 199 --- cli/vendor/golang.org/x/crypto/bn256/bn256.go | 404 - .../golang.org/x/crypto/bn256/bn256_test.go | 304 .../golang.org/x/crypto/bn256/constants.go | 44 - cli/vendor/golang.org/x/crypto/bn256/curve.go | 278 .../golang.org/x/crypto/bn256/example_test.go | 43 - cli/vendor/golang.org/x/crypto/bn256/gfp12.go | 200 --- cli/vendor/golang.org/x/crypto/bn256/gfp2.go| 219 --- cli/vendor/golang.org/x/crypto/bn256/gfp6.go| 296 cli/vendor/golang.org/x/crypto/bn256/optate.go | 395 - cli/vendor/golang.org/x/crypto/bn256/twist.go | 249 --- cli/vendor/golang.org/x/crypto/cast5/cast5.go | 526 -- .../golang.org/x/crypto/cast5/cast5_test.go | 106 -- cli/vendor/golang.org/x/crypto/codereview.cfg |1 - .../x/crypto/curve25519/const_amd64.s | 20 - .../x/crypto/curve25519/cswap_amd64.s | 88 - .../x/crypto/curve25519/curve25519.go | 841 -- .../x/crypto/curve25519/curve25519_test.go | 29 - .../golang.org/x/crypto/curve25519/doc.go | 23 - .../x/crypto/curve25519/freeze_amd64.s | 94 -- .../x/crypto/curve25519/ladderstep_amd64.s | 1398 .../x/crypto/curve25519/mont25519_amd64.go | 240 --- .../golang.org/x/crypto/curve25519/mul_amd64.s | 191 --- .../x/crypto/curve25519/square_amd64.s | 153 -- .../golang.org/x/crypto/hkdf/example_test.go| 61 - cli/vendor/golang.org/x/crypto/hkdf/hkdf.go | 75 - .../golang.org/x/crypto/hkdf/hkdf_test.go | 370 - cli/vendor/golang.org/x/crypto/md4/md4.go | 118 -- cli/vendor/golang.org/x/crypto/md4/md4_test.go | 71 - cli/vendor/golang.org/x/crypto/md4/md4block.go | 89 - cli/vendor/golang.org/x/crypto/nacl/box/box.go | 85 - .../golang.org/x/crypto/nacl/box/box_test.go| 78 - .../x/crypto/nacl/secretbox/secretbox.go| 149 -- .../x/crypto/nacl/secretbox/secretbox_test.go | 91 -- cli/vendor/golang.org/x/crypto/ocsp/ocsp.go | 673 .../golang.org/x/crypto/ocsp/ocsp_test.go | 584 --- .../golang.org/x/crypto/openpgp/armor/armor.go | 219 --- .../x/crypto/openpgp/armor/armor_test.go| 95 -- .../golang.org/x/crypto/openpgp/armor/encode.go |
[15/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s -- diff --git a/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s b/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s deleted file mode 100644 index 3949f9c..000 --- a/cli/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s +++ /dev/null @@ -1,1398 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// This code was translated into a form compatible with 6a from the public -// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html - -// +build amd64,!gccgo,!appengine - -// func ladderstep(inout *[5][5]uint64) -TEXT ·ladderstep(SB),0,$384-8 - MOVQ inout+0(FP),DI - - MOVQ SP,R11 - MOVQ $31,CX - NOTQ CX - ANDQ CX,SP - ADDQ $32,SP - - MOVQ R11,0(SP) - MOVQ R12,8(SP) - MOVQ R13,16(SP) - MOVQ R14,24(SP) - MOVQ R15,32(SP) - MOVQ BX,40(SP) - MOVQ BP,48(SP) - MOVQ 40(DI),SI - MOVQ 48(DI),DX - MOVQ 56(DI),CX - MOVQ 64(DI),R8 - MOVQ 72(DI),R9 - MOVQ SI,AX - MOVQ DX,R10 - MOVQ CX,R11 - MOVQ R8,R12 - MOVQ R9,R13 - ADDQ ·_2P0(SB),AX - ADDQ ·_2P1234(SB),R10 - ADDQ ·_2P1234(SB),R11 - ADDQ ·_2P1234(SB),R12 - ADDQ ·_2P1234(SB),R13 - ADDQ 80(DI),SI - ADDQ 88(DI),DX - ADDQ 96(DI),CX - ADDQ 104(DI),R8 - ADDQ 112(DI),R9 - SUBQ 80(DI),AX - SUBQ 88(DI),R10 - SUBQ 96(DI),R11 - SUBQ 104(DI),R12 - SUBQ 112(DI),R13 - MOVQ SI,56(SP) - MOVQ DX,64(SP) - MOVQ CX,72(SP) - MOVQ R8,80(SP) - MOVQ R9,88(SP) - MOVQ AX,96(SP) - MOVQ R10,104(SP) - MOVQ R11,112(SP) - MOVQ R12,120(SP) - MOVQ R13,128(SP) - MOVQ 96(SP),AX - MULQ 96(SP) - MOVQ AX,SI - MOVQ DX,CX - MOVQ 96(SP),AX - SHLQ $1,AX - MULQ 104(SP) - MOVQ AX,R8 - MOVQ DX,R9 - MOVQ 96(SP),AX - SHLQ $1,AX - MULQ 112(SP) - MOVQ AX,R10 - MOVQ DX,R11 - MOVQ 96(SP),AX - SHLQ $1,AX - MULQ 120(SP) - MOVQ AX,R12 - MOVQ DX,R13 - MOVQ 96(SP),AX - SHLQ $1,AX - MULQ 128(SP) - MOVQ AX,R14 - MOVQ DX,R15 - MOVQ 104(SP),AX - MULQ 104(SP) - ADDQ AX,R10 - ADCQ DX,R11 - MOVQ 104(SP),AX - SHLQ $1,AX - MULQ 112(SP) - ADDQ AX,R12 - ADCQ DX,R13 - MOVQ 104(SP),AX - SHLQ $1,AX - MULQ 120(SP) - ADDQ AX,R14 - ADCQ DX,R15 - MOVQ 104(SP),DX - IMUL3Q $38,DX,AX - MULQ 128(SP) - ADDQ AX,SI - ADCQ DX,CX - MOVQ 112(SP),AX - MULQ 112(SP) - ADDQ AX,R14 - ADCQ DX,R15 - MOVQ 112(SP),DX - IMUL3Q $38,DX,AX - MULQ 120(SP) - ADDQ AX,SI - ADCQ DX,CX - MOVQ 112(SP),DX - IMUL3Q $38,DX,AX - MULQ 128(SP) - ADDQ AX,R8 - ADCQ DX,R9 - MOVQ 120(SP),DX - IMUL3Q $19,DX,AX - MULQ 120(SP) - ADDQ AX,R8 - ADCQ DX,R9 - MOVQ 120(SP),DX - IMUL3Q $38,DX,AX - MULQ 128(SP) - ADDQ AX,R10 - ADCQ DX,R11 - MOVQ 128(SP),DX - IMUL3Q $19,DX,AX - MULQ 128(SP) - ADDQ AX,R12 - ADCQ DX,R13 - MOVQ ·REDMASK51(SB),DX - SHLQ $13,CX:SI - ANDQ DX,SI - SHLQ $13,R9:R8 - ANDQ DX,R8 - ADDQ CX,R8 - SHLQ $13,R11:R10 - ANDQ DX,R10 - ADDQ R9,R10 - SHLQ $13,R13:R12 - ANDQ DX,R12 - ADDQ R11,R12 - SHLQ $13,R15:R14 - ANDQ DX,R14 - ADDQ R13,R14 - IMUL3Q $19,R15,CX - ADDQ CX,SI - MOVQ SI,CX - SHRQ $51,CX - ADDQ R8,CX - ANDQ DX,SI - MOVQ CX,R8 - SHRQ $51,CX - ADDQ R10,CX - ANDQ DX,R8 - MOVQ CX,R9 - SHRQ $51,CX - ADDQ R12,CX - ANDQ DX,R9 - MOVQ CX,AX - SHRQ $51,CX - ADDQ R14,CX - ANDQ DX,AX - MOVQ CX,R10 - SHRQ $51,CX - IMUL3Q $19,CX,CX - ADDQ CX,SI - ANDQ DX,R10 - MOVQ SI,136(SP) - MOVQ R8,144(SP) - MOVQ R9,152(SP) - MOVQ AX,160(SP) - MOVQ R10,168(SP) - MOVQ 56(SP),AX - MULQ 56(SP) - MOVQ AX,SI - MOVQ DX,CX - MOVQ 56(SP),AX - SHLQ $1,AX - MULQ 64(SP) - MOVQ AX,R8 - MOVQ DX,R9 - MOVQ 56(SP),AX - SHLQ $1,AX - MULQ 72(SP) - MOVQ AX,R10 - MOVQ DX,R11 - MOVQ 56(SP),AX - SHLQ $1,AX - MULQ 80(SP) - MOVQ AX,R12 - MOVQ DX,R13 - MOVQ 56(SP),AX - SHLQ $1,AX - MULQ 88(SP) - MOVQ AX,R14 - MOVQ DX,R15 - MOVQ 64(SP),AX - MULQ
[12/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
--
diff --git a/cli/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
b/cli/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
deleted file mode 100644
index 456d807..000
--- a/cli/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
- "bytes"
- "io"
- "io/ioutil"
-
- "golang.org/x/crypto/openpgp/errors"
-)
-
-// OpaquePacket represents an OpenPGP packet as raw, unparsed data. This is
-// useful for splitting and storing the original packet contents separately,
-// handling unsupported packet types or accessing parts of the packet not yet
-// implemented by this package.
-type OpaquePacket struct {
- // Packet type
- Tag uint8
- // Reason why the packet was parsed opaquely
- Reason error
- // Binary contents of the packet data
- Contents []byte
-}
-
-func (op *OpaquePacket) parse(r io.Reader) (err error) {
- op.Contents, err = ioutil.ReadAll(r)
- return
-}
-
-// Serialize marshals the packet to a writer in its original form, including
-// the packet header.
-func (op *OpaquePacket) Serialize(w io.Writer) (err error) {
- err = serializeHeader(w, packetType(op.Tag), len(op.Contents))
- if err == nil {
- _, err = w.Write(op.Contents)
- }
- return
-}
-
-// Parse attempts to parse the opaque contents into a structure supported by
-// this package. If the packet is not known then the result will be another
-// OpaquePacket.
-func (op *OpaquePacket) Parse() (p Packet, err error) {
- hdr := bytes.NewBuffer(nil)
- err = serializeHeader(hdr, packetType(op.Tag), len(op.Contents))
- if err != nil {
- op.Reason = err
- return op, err
- }
- p, err = Read(io.MultiReader(hdr, bytes.NewBuffer(op.Contents)))
- if err != nil {
- op.Reason = err
- p = op
- }
- return
-}
-
-// OpaqueReader reads OpaquePackets from an io.Reader.
-type OpaqueReader struct {
- r io.Reader
-}
-
-func NewOpaqueReader(r io.Reader) *OpaqueReader {
- return {r: r}
-}
-
-// Read the next OpaquePacket.
-func (or *OpaqueReader) Next() (op *OpaquePacket, err error) {
- tag, _, contents, err := readHeader(or.r)
- if err != nil {
- return
- }
- op = {Tag: uint8(tag), Reason: err}
- err = op.parse(contents)
- if err != nil {
- consumeAll(contents)
- }
- return
-}
-
-// OpaqueSubpacket represents an unparsed OpenPGP subpacket,
-// as found in signature and user attribute packets.
-type OpaqueSubpacket struct {
- SubType uint8
- Contents []byte
-}
-
-// OpaqueSubpackets extracts opaque, unparsed OpenPGP subpackets from
-// their byte representation.
-func OpaqueSubpackets(contents []byte) (result []*OpaqueSubpacket, err error) {
- var (
- subHeaderLen int
- subPacket*OpaqueSubpacket
- )
- for len(contents) > 0 {
- subHeaderLen, subPacket, err = nextSubpacket(contents)
- if err != nil {
- break
- }
- result = append(result, subPacket)
- contents = contents[subHeaderLen+len(subPacket.Contents):]
- }
- return
-}
-
-func nextSubpacket(contents []byte) (subHeaderLen int, subPacket
*OpaqueSubpacket, err error) {
- // RFC 4880, section 5.2.3.1
- var subLen uint32
- if len(contents) < 1 {
- goto Truncated
- }
- subPacket = {}
- switch {
- case contents[0] < 192:
- subHeaderLen = 2 // 1 length byte, 1 subtype byte
- if len(contents) < subHeaderLen {
- goto Truncated
- }
- subLen = uint32(contents[0])
- contents = contents[1:]
- case contents[0] < 255:
- subHeaderLen = 3 // 2 length bytes, 1 subtype
- if len(contents) < subHeaderLen {
- goto Truncated
- }
- subLen = uint32(contents[0]-192)<<8 + uint32(contents[1]) + 192
- contents = contents[2:]
- default:
- subHeaderLen = 6 // 5 length bytes, 1 subtype
- if len(contents) < subHeaderLen {
- goto Truncated
- }
- subLen = uint32(contents[1])<<24 |
- uint32(contents[2])<<16 |
- uint32(contents[3])<<8 |
- uint32(contents[4])
- contents =
[21/21] brooklyn-client git commit: This closes #72
This closes #72 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/45beb319 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/45beb319 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/45beb319 Branch: refs/heads/master Commit: 45beb31900f2e67f7ae39bb9b0b42952b8654a29 Parents: d8ef284 868863a Author: Thomas Bouron Authored: Tue Nov 20 09:20:40 2018 + Committer: Thomas Bouron Committed: Tue Nov 20 09:20:40 2018 + -- cli/Gopkg.lock | 37 + cli/Gopkg.toml | 28 + cli/README.md |4 +- cli/glide.lock | 15 - cli/glide.yaml |9 - cli/pom.xml |3 +- cli/release/build.sh|1 - .../NodePrime/jsonpath/cli/jsonpath/main.go | 94 -- .../github.com/NodePrime/jsonpath/eval_test.go | 101 -- .../jsonpath/expression_states_test.go | 40 - .../NodePrime/jsonpath/expression_test.go | 226 --- .../NodePrime/jsonpath/json_states_test.go | 172 -- .../github.com/NodePrime/jsonpath/lexer_test.go | 309 .../NodePrime/jsonpath/path_states_test.go | 30 - .../github.com/NodePrime/jsonpath/path_test.go | 40 - .../github.com/NodePrime/jsonpath/stack_test.go | 56 - cli/vendor/github.com/urfave/cli/app_test.go| 1047 .../urfave/cli/autocomplete/bash_autocomplete | 14 - .../urfave/cli/autocomplete/zsh_autocomplete|5 - .../github.com/urfave/cli/command_test.go | 97 -- .../github.com/urfave/cli/context_test.go | 113 -- cli/vendor/github.com/urfave/cli/flag_test.go | 859 -- cli/vendor/github.com/urfave/cli/help_test.go | 94 -- .../github.com/urfave/cli/helpers_test.go | 19 - cli/vendor/golang.org/x/crypto/.gitattributes | 10 - cli/vendor/golang.org/x/crypto/.gitignore |2 - cli/vendor/golang.org/x/crypto/CONTRIBUTING.md | 31 - cli/vendor/golang.org/x/crypto/README |3 - cli/vendor/golang.org/x/crypto/bcrypt/base64.go | 35 - cli/vendor/golang.org/x/crypto/bcrypt/bcrypt.go | 294 .../golang.org/x/crypto/bcrypt/bcrypt_test.go | 226 --- .../golang.org/x/crypto/blowfish/block.go | 159 -- .../x/crypto/blowfish/blowfish_test.go | 274 .../golang.org/x/crypto/blowfish/cipher.go | 91 -- .../golang.org/x/crypto/blowfish/const.go | 199 --- cli/vendor/golang.org/x/crypto/bn256/bn256.go | 404 - .../golang.org/x/crypto/bn256/bn256_test.go | 304 .../golang.org/x/crypto/bn256/constants.go | 44 - cli/vendor/golang.org/x/crypto/bn256/curve.go | 278 .../golang.org/x/crypto/bn256/example_test.go | 43 - cli/vendor/golang.org/x/crypto/bn256/gfp12.go | 200 --- cli/vendor/golang.org/x/crypto/bn256/gfp2.go| 219 --- cli/vendor/golang.org/x/crypto/bn256/gfp6.go| 296 cli/vendor/golang.org/x/crypto/bn256/optate.go | 395 - cli/vendor/golang.org/x/crypto/bn256/twist.go | 249 --- cli/vendor/golang.org/x/crypto/cast5/cast5.go | 526 -- .../golang.org/x/crypto/cast5/cast5_test.go | 106 -- cli/vendor/golang.org/x/crypto/codereview.cfg |1 - .../x/crypto/curve25519/const_amd64.s | 20 - .../x/crypto/curve25519/cswap_amd64.s | 88 - .../x/crypto/curve25519/curve25519.go | 841 -- .../x/crypto/curve25519/curve25519_test.go | 29 - .../golang.org/x/crypto/curve25519/doc.go | 23 - .../x/crypto/curve25519/freeze_amd64.s | 94 -- .../x/crypto/curve25519/ladderstep_amd64.s | 1398 .../x/crypto/curve25519/mont25519_amd64.go | 240 --- .../golang.org/x/crypto/curve25519/mul_amd64.s | 191 --- .../x/crypto/curve25519/square_amd64.s | 153 -- .../golang.org/x/crypto/hkdf/example_test.go| 61 - cli/vendor/golang.org/x/crypto/hkdf/hkdf.go | 75 - .../golang.org/x/crypto/hkdf/hkdf_test.go | 370 - cli/vendor/golang.org/x/crypto/md4/md4.go | 118 -- cli/vendor/golang.org/x/crypto/md4/md4_test.go | 71 - cli/vendor/golang.org/x/crypto/md4/md4block.go | 89 - cli/vendor/golang.org/x/crypto/nacl/box/box.go | 85 - .../golang.org/x/crypto/nacl/box/box_test.go| 78 - .../x/crypto/nacl/secretbox/secretbox.go| 149 -- .../x/crypto/nacl/secretbox/secretbox_test.go | 91 -- cli/vendor/golang.org/x/crypto/ocsp/ocsp.go | 673 .../golang.org/x/crypto/ocsp/ocsp_test.go | 584 --- .../golang.org/x/crypto/openpgp/armor/armor.go | 219 --- .../x/crypto/openpgp/armor/armor_test.go| 95 -- .../golang.org/x/crypto/openpgp/armor/encode.go | 160 --
[1/2] brooklyn-dist git commit: Update dockerfile-maven-plugin to 1.4.3 to fix build problem
Repository: brooklyn-dist
Updated Branches:
refs/heads/master f723e574b -> b84ef9498
Update dockerfile-maven-plugin to 1.4.3 to fix build problem
Building on OSX I get
```
[ERROR] Failed to execute goal com.spotify:dockerfile-maven-plugin:1.4.0:build
(default) on project brooklyn-dist: Could not build image:
com.spotify.docker.client.shaded.com.fasterxml.jackson.databind.exc.MismatchedInputException:
Cannot construct instance of `com.spotify.docker.client.messages.RegistryAuth`
(although at least one Creator exists): no String-argument constructor/factory
method to deserialize from String value ('osxkeychain')
[ERROR] at [Source: UNKNOWN; line: -1, column: -1] (through reference chain:
java.util.LinkedHashMap["credSstore"])
```
Updating the plugin to 1.4.3 per the comment below fixed this issue for
me.
https://github.com/dlcs/elucidate-server/issues/89#issuecomment-411219914
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3b1b9e5b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3b1b9e5b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3b1b9e5b
Branch: refs/heads/master
Commit: 3b1b9e5b53241c6ed4201919d0718e974f3b314c
Parents: f723e57
Author: Geoff Macartney
Authored: Sun Nov 18 23:04:45 2018 +
Committer: Geoff Macartney
Committed: Sun Nov 18 23:04:45 2018 +
--
dist/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3b1b9e5b/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index 22d6de1..b634117 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -126,7 +126,7 @@
com.spotify
dockerfile-maven-plugin
-1.4.0
+1.4.3
default
[2/2] brooklyn-dist git commit: This closes #130
This closes #130 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/b84ef949 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/b84ef949 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/b84ef949 Branch: refs/heads/master Commit: b84ef9498c17a82d97f173b6ec007ecf24a777cc Parents: f723e57 3b1b9e5 Author: Thomas Bouron Authored: Tue Nov 20 09:22:42 2018 + Committer: Thomas Bouron Committed: Tue Nov 20 09:22:42 2018 + -- dist/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[03/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/keys.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/keys.go
b/cli/vendor/golang.org/x/crypto/ssh/keys.go
deleted file mode 100644
index cfc970b..000
--- a/cli/vendor/golang.org/x/crypto/ssh/keys.go
+++ /dev/null
@@ -1,720 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
- "bytes"
- "crypto"
- "crypto/dsa"
- "crypto/ecdsa"
- "crypto/elliptic"
- "crypto/rsa"
- "crypto/x509"
- "encoding/asn1"
- "encoding/base64"
- "encoding/pem"
- "errors"
- "fmt"
- "io"
- "math/big"
- "strings"
-)
-
-// These constants represent the algorithm names for key types supported by
this
-// package.
-const (
- KeyAlgoRSA = "ssh-rsa"
- KeyAlgoDSA = "ssh-dss"
- KeyAlgoECDSA256 = "ecdsa-sha2-nistp256"
- KeyAlgoECDSA384 = "ecdsa-sha2-nistp384"
- KeyAlgoECDSA521 = "ecdsa-sha2-nistp521"
-)
-
-// parsePubKey parses a public key of the given algorithm.
-// Use ParsePublicKey for keys with prepended algorithm.
-func parsePubKey(in []byte, algo string) (pubKey PublicKey, rest []byte, err
error) {
- switch algo {
- case KeyAlgoRSA:
- return parseRSA(in)
- case KeyAlgoDSA:
- return parseDSA(in)
- case KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521:
- return parseECDSA(in)
- case CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01,
CertAlgoECDSA384v01, CertAlgoECDSA521v01:
- cert, err := parseCert(in, certToPrivAlgo(algo))
- if err != nil {
- return nil, nil, err
- }
- return cert, nil, nil
- }
- return nil, nil, fmt.Errorf("ssh: unknown key algorithm: %v", err)
-}
-
-// parseAuthorizedKey parses a public key in OpenSSH authorized_keys format
-// (see sshd(8) manual page) once the options and key type fields have been
-// removed.
-func parseAuthorizedKey(in []byte) (out PublicKey, comment string, err error) {
- in = bytes.TrimSpace(in)
-
- i := bytes.IndexAny(in, " \t")
- if i == -1 {
- i = len(in)
- }
- base64Key := in[:i]
-
- key := make([]byte, base64.StdEncoding.DecodedLen(len(base64Key)))
- n, err := base64.StdEncoding.Decode(key, base64Key)
- if err != nil {
- return nil, "", err
- }
- key = key[:n]
- out, err = ParsePublicKey(key)
- if err != nil {
- return nil, "", err
- }
- comment = string(bytes.TrimSpace(in[i:]))
- return out, comment, nil
-}
-
-// ParseKnownHosts parses an entry in the format of the known_hosts file.
-//
-// The known_hosts format is documented in the sshd(8) manual page. This
-// function will parse a single entry from in. On successful return, marker
-// will contain the optional marker value (i.e. "cert-authority" or "revoked")
-// or else be empty, hosts will contain the hosts that this entry matches,
-// pubKey will contain the public key and comment will contain any trailing
-// comment at the end of the line. See the sshd(8) manual page for the various
-// forms that a host string can take.
-//
-// The unparsed remainder of the input will be returned in rest. This function
-// can be called repeatedly to parse multiple entries.
-//
-// If no entries were found in the input then err will be io.EOF. Otherwise a
-// non-nil err value indicates a parse error.
-func ParseKnownHosts(in []byte) (marker string, hosts []string, pubKey
PublicKey, comment string, rest []byte, err error) {
- for len(in) > 0 {
- end := bytes.IndexByte(in, '\n')
- if end != -1 {
- rest = in[end+1:]
- in = in[:end]
- } else {
- rest = nil
- }
-
- end = bytes.IndexByte(in, '\r')
- if end != -1 {
- in = in[:end]
- }
-
- in = bytes.TrimSpace(in)
- if len(in) == 0 || in[0] == '#' {
- in = rest
- continue
- }
-
- i := bytes.IndexAny(in, " \t")
- if i == -1 {
- in = rest
- continue
- }
-
- // Strip out the begining of the known_host key.
- // This is either an optional marker or a (set of) hostname(s).
- keyFields := bytes.Fields(in)
- if len(keyFields) < 3 || len(keyFields) > 5 {
- return "", nil, nil, "", nil, errors.New("ssh: invalid
entry in known_hosts
[09/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/otr/otr.go
--
diff --git a/cli/vendor/golang.org/x/crypto/otr/otr.go
b/cli/vendor/golang.org/x/crypto/otr/otr.go
deleted file mode 100644
index 549be11..000
--- a/cli/vendor/golang.org/x/crypto/otr/otr.go
+++ /dev/null
@@ -1,1408 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package otr implements the Off The Record protocol as specified in
-// http://www.cypherpunks.ca/otr/Protocol-v2-3.1.0.html
-package otr // import "golang.org/x/crypto/otr"
-
-import (
- "bytes"
- "crypto/aes"
- "crypto/cipher"
- "crypto/dsa"
- "crypto/hmac"
- "crypto/rand"
- "crypto/sha1"
- "crypto/sha256"
- "crypto/subtle"
- "encoding/base64"
- "encoding/hex"
- "errors"
- "hash"
- "io"
- "math/big"
- "strconv"
-)
-
-// SecurityChange describes a change in the security state of a Conversation.
-type SecurityChange int
-
-const (
- NoChange SecurityChange = iota
- // NewKeys indicates that a key exchange has completed. This occurs
- // when a conversation first becomes encrypted, and when the keys are
- // renegotiated within an encrypted conversation.
- NewKeys
- // SMPSecretNeeded indicates that the peer has started an
- // authentication and that we need to supply a secret. Call SMPQuestion
- // to get the optional, human readable challenge and then Authenticate
- // to supply the matching secret.
- SMPSecretNeeded
- // SMPComplete indicates that an authentication completed. The identity
- // of the peer has now been confirmed.
- SMPComplete
- // SMPFailed indicates that an authentication failed.
- SMPFailed
- // ConversationEnded indicates that the peer ended the secure
- // conversation.
- ConversationEnded
-)
-
-// QueryMessage can be sent to a peer to start an OTR conversation.
-var QueryMessage = "?OTRv2?"
-
-// ErrorPrefix can be used to make an OTR error by appending an error message
-// to it.
-var ErrorPrefix = "?OTR Error:"
-
-var (
- fragmentPartSeparator = []byte(",")
- fragmentPrefix= []byte("?OTR,")
- msgPrefix = []byte("?OTR:")
- queryMarker = []byte("?OTR")
-)
-
-// isQuery attempts to parse an OTR query from msg and returns the greatest
-// common version, or 0 if msg is not an OTR query.
-func isQuery(msg []byte) (greatestCommonVersion int) {
- pos := bytes.Index(msg, queryMarker)
- if pos == -1 {
- return 0
- }
- for i, c := range msg[pos+len(queryMarker):] {
- if i == 0 {
- if c == '?' {
- // Indicates support for version 1, but we don't
- // implement that.
- continue
- }
-
- if c != 'v' {
- // Invalid message
- return 0
- }
-
- continue
- }
-
- if c == '?' {
- // End of message
- return
- }
-
- if c == ' ' || c == '\t' {
- // Probably an invalid message
- return 0
- }
-
- if c == '2' {
- greatestCommonVersion = 2
- }
- }
-
- return 0
-}
-
-const (
- statePlaintext = iota
- stateEncrypted
- stateFinished
-)
-
-const (
- authStateNone = iota
- authStateAwaitingDHKey
- authStateAwaitingRevealSig
- authStateAwaitingSig
-)
-
-const (
- msgTypeDHCommit = 2
- msgTypeData = 3
- msgTypeDHKey = 10
- msgTypeRevealSig = 17
- msgTypeSig = 18
-)
-
-const (
- // If the requested fragment size is less than this, it will be ignored.
- minFragmentSize = 18
- // Messages are padded to a multiple of this number of bytes.
- paddingGranularity = 256
- // The number of bytes in a Diffie-Hellman private value (320-bits).
- dhPrivateBytes = 40
- // The number of bytes needed to represent an element of the DSA
- // subgroup (160-bits).
- dsaSubgroupBytes = 20
- // The number of bytes of the MAC that are sent on the wire (160-bits).
- macPrefixBytes = 20
-)
-
-// These are the global, common group parameters for OTR.
-var (
- p *big.Int // group prime
- g *big.Int // group generator
- q *big.Int // group order
- pMinus2 *big.Int
-)
-
-func init() {
- p, _ =
[04/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/client_auth_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/client_auth_test.go
b/cli/vendor/golang.org/x/crypto/ssh/client_auth_test.go
deleted file mode 100644
index 2ea4462..000
--- a/cli/vendor/golang.org/x/crypto/ssh/client_auth_test.go
+++ /dev/null
@@ -1,393 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
- "bytes"
- "crypto/rand"
- "errors"
- "fmt"
- "strings"
- "testing"
-)
-
-type keyboardInteractive map[string]string
-
-func (cr keyboardInteractive) Challenge(user string, instruction string,
questions []string, echos []bool) ([]string, error) {
- var answers []string
- for _, q := range questions {
- answers = append(answers, cr[q])
- }
- return answers, nil
-}
-
-// reused internally by tests
-var clientPassword = "tiger"
-
-// tryAuth runs a handshake with a given config against an SSH server
-// with config serverConfig
-func tryAuth(t *testing.T, config *ClientConfig) error {
- c1, c2, err := netPipe()
- if err != nil {
- t.Fatalf("netPipe: %v", err)
- }
- defer c1.Close()
- defer c2.Close()
-
- certChecker := CertChecker{
- IsAuthority: func(k PublicKey) bool {
- return bytes.Equal(k.Marshal(),
testPublicKeys["ecdsa"].Marshal())
- },
- UserKeyFallback: func(conn ConnMetadata, key PublicKey)
(*Permissions, error) {
- if conn.User() == "testuser" &&
bytes.Equal(key.Marshal(), testPublicKeys["rsa"].Marshal()) {
- return nil, nil
- }
-
- return nil, fmt.Errorf("pubkey for %q not acceptable",
conn.User())
- },
- IsRevoked: func(c *Certificate) bool {
- return c.Serial == 666
- },
- }
-
- serverConfig := {
- PasswordCallback: func(conn ConnMetadata, pass []byte)
(*Permissions, error) {
- if conn.User() == "testuser" && string(pass) ==
clientPassword {
- return nil, nil
- }
- return nil, errors.New("password auth failed")
- },
- PublicKeyCallback: certChecker.Authenticate,
- KeyboardInteractiveCallback: func(conn ConnMetadata, challenge
KeyboardInteractiveChallenge) (*Permissions, error) {
- ans, err := challenge("user",
- "instruction",
- []string{"question1", "question2"},
- []bool{true, true})
- if err != nil {
- return nil, err
- }
- ok := conn.User() == "testuser" && ans[0] == "answer1"
&& ans[1] == "answer2"
- if ok {
- challenge("user", "motd", nil, nil)
- return nil, nil
- }
- return nil, errors.New("keyboard-interactive failed")
- },
- AuthLogCallback: func(conn ConnMetadata, method string, err
error) {
- t.Logf("user %q, method %q: %v", conn.User(), method,
err)
- },
- }
- serverConfig.AddHostKey(testSigners["rsa"])
-
- go newServer(c1, serverConfig)
- _, _, _, err = NewClientConn(c2, "", config)
- return err
-}
-
-func TestClientAuthPublicKey(t *testing.T) {
- config := {
- User: "testuser",
- Auth: []AuthMethod{
- PublicKeys(testSigners["rsa"]),
- },
- }
- if err := tryAuth(t, config); err != nil {
- t.Fatalf("unable to dial remote side: %s", err)
- }
-}
-
-func TestAuthMethodPassword(t *testing.T) {
- config := {
- User: "testuser",
- Auth: []AuthMethod{
- Password(clientPassword),
- },
- }
-
- if err := tryAuth(t, config); err != nil {
- t.Fatalf("unable to dial remote side: %s", err)
- }
-}
-
-func TestAuthMethodFallback(t *testing.T) {
- var passwordCalled bool
- config := {
- User: "testuser",
- Auth: []AuthMethod{
- PublicKeys(testSigners["rsa"]),
- PasswordCallback(
- func() (string, error) {
- passwordCalled = true
- return
[05/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/buffer_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/buffer_test.go
b/cli/vendor/golang.org/x/crypto/ssh/buffer_test.go
deleted file mode 100644
index d5781cb..000
--- a/cli/vendor/golang.org/x/crypto/ssh/buffer_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
- "io"
- "testing"
-)
-
-var alphabet = []byte("abcdefghijklmnopqrstuvwxyz")
-
-func TestBufferReadwrite(t *testing.T) {
- b := newBuffer()
- b.write(alphabet[:10])
- r, _ := b.Read(make([]byte, 10))
- if r != 10 {
- t.Fatalf("Expected written == read == 10, written: 10, read
%d", r)
- }
-
- b = newBuffer()
- b.write(alphabet[:5])
- r, _ = b.Read(make([]byte, 10))
- if r != 5 {
- t.Fatalf("Expected written == read == 5, written: 5, read %d",
r)
- }
-
- b = newBuffer()
- b.write(alphabet[:10])
- r, _ = b.Read(make([]byte, 5))
- if r != 5 {
- t.Fatalf("Expected written == 10, read == 5, written: 10, read
%d", r)
- }
-
- b = newBuffer()
- b.write(alphabet[:5])
- b.write(alphabet[5:15])
- r, _ = b.Read(make([]byte, 10))
- r2, _ := b.Read(make([]byte, 10))
- if r != 10 || r2 != 5 || 15 != r+r2 {
- t.Fatal("Expected written == read == 15")
- }
-}
-
-func TestBufferClose(t *testing.T) {
- b := newBuffer()
- b.write(alphabet[:10])
- b.eof()
- _, err := b.Read(make([]byte, 5))
- if err != nil {
- t.Fatal("expected read of 5 to not return EOF")
- }
- b = newBuffer()
- b.write(alphabet[:10])
- b.eof()
- r, err := b.Read(make([]byte, 5))
- r2, err2 := b.Read(make([]byte, 10))
- if r != 5 || r2 != 5 || err != nil || err2 != nil {
- t.Fatal("expected reads of 5 and 5")
- }
-
- b = newBuffer()
- b.write(alphabet[:10])
- b.eof()
- r, err = b.Read(make([]byte, 5))
- r2, err2 = b.Read(make([]byte, 10))
- r3, err3 := b.Read(make([]byte, 10))
- if r != 5 || r2 != 5 || r3 != 0 || err != nil || err2 != nil || err3 !=
io.EOF {
- t.Fatal("expected reads of 5 and 5 and 0, with EOF")
- }
-
- b = newBuffer()
- b.write(make([]byte, 5))
- b.write(make([]byte, 10))
- b.eof()
- r, err = b.Read(make([]byte, 9))
- r2, err2 = b.Read(make([]byte, 3))
- r3, err3 = b.Read(make([]byte, 3))
- r4, err4 := b.Read(make([]byte, 10))
- if err != nil || err2 != nil || err3 != nil || err4 != io.EOF {
- t.Fatalf("Expected EOF on forth read only, err=%v, err2=%v,
err3=%v, err4=%v", err, err2, err3, err4)
- }
- if r != 9 || r2 != 3 || r3 != 3 || r4 != 0 {
- t.Fatal("Expected written == read == 15", r, r2, r3, r4)
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/certs.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/certs.go
b/cli/vendor/golang.org/x/crypto/ssh/certs.go
deleted file mode 100644
index 3857700..000
--- a/cli/vendor/golang.org/x/crypto/ssh/certs.go
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
- "bytes"
- "errors"
- "fmt"
- "io"
- "net"
- "sort"
- "time"
-)
-
-// These constants from [PROTOCOL.certkeys] represent the algorithm names
-// for certificate types supported by this package.
-const (
- CertAlgoRSAv01 = "ssh-rsa-cert-...@openssh.com"
- CertAlgoDSAv01 = "ssh-dss-cert-...@openssh.com"
- CertAlgoECDSA256v01 = "ecdsa-sha2-nistp256-cert-...@openssh.com"
- CertAlgoECDSA384v01 = "ecdsa-sha2-nistp384-cert-...@openssh.com"
- CertAlgoECDSA521v01 = "ecdsa-sha2-nistp521-cert-...@openssh.com"
-)
-
-// Certificate types distinguish between host and user
-// certificates. The values can be set in the CertType field of
-// Certificate.
-const (
- UserCert = 1
- HostCert = 2
-)
-
-// Signature represents a cryptographic signature.
-type Signature struct {
- Format string
- Blob []byte
-}
-
-// CertTimeInfinity can be used for OpenSSHCertV01.ValidBefore to indicate that
-// a certificate does not expire.
-const CertTimeInfinity = 1<<64 - 1
-
-// An Certificate represents an OpenSSH certificate as defined in
-// [PROTOCOL.certkeys]?rev=1.8.
-type
[06/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/sha3/doc.go
--
diff --git a/cli/vendor/golang.org/x/crypto/sha3/doc.go
b/cli/vendor/golang.org/x/crypto/sha3/doc.go
deleted file mode 100644
index a0ee3ae..000
--- a/cli/vendor/golang.org/x/crypto/sha3/doc.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package sha3 implements the SHA-3 fixed-output-length hash functions and
-// the SHAKE variable-output-length hash functions defined by FIPS-202.
-//
-// Both types of hash function use the "sponge" construction and the Keccak
-// permutation. For a detailed specification see http://keccak.noekeon.org/
-//
-//
-// Guidance
-//
-// If you aren't sure what function you need, use SHAKE256 with at least 64
-// bytes of output. The SHAKE instances are faster than the SHA3 instances;
-// the latter have to allocate memory to conform to the hash.Hash interface.
-//
-// If you need a secret-key MAC (message authentication code), prepend the
-// secret key to the input, hash with SHAKE256 and read at least 32 bytes of
-// output.
-//
-//
-// Security strengths
-//
-// The SHA3-x (x equals 224, 256, 384, or 512) functions have a security
-// strength against preimage attacks of x bits. Since they only produce "x"
-// bits of output, their collision-resistance is only "x/2" bits.
-//
-// The SHAKE-256 and -128 functions have a generic security strength of 256 and
-// 128 bits against all attacks, provided that at least 2x bits of their output
-// is used. Requesting more than 64 or 32 bytes of output, respectively, does
-// not increase the collision-resistance of the SHAKE functions.
-//
-//
-// The sponge construction
-//
-// A sponge builds a pseudo-random function from a public pseudo-random
-// permutation, by applying the permutation to a state of "rate + capacity"
-// bytes, but hiding "capacity" of the bytes.
-//
-// A sponge starts out with a zero state. To hash an input using a sponge, up
-// to "rate" bytes of the input are XORed into the sponge's state. The sponge
-// is then "full" and the permutation is applied to "empty" it. This process is
-// repeated until all the input has been "absorbed". The input is then padded.
-// The digest is "squeezed" from the sponge in the same way, except that output
-// output is copied out instead of input being XORed in.
-//
-// A sponge is parameterized by its generic security strength, which is equal
-// to half its capacity; capacity + rate is equal to the permutation's width.
-// Since the KeccakF-1600 permutation is 1600 bits (200 bytes) wide, this means
-// that the security strength of a sponge instance is equal to (1600 -
bitrate) / 2.
-//
-//
-// Recommendations
-//
-// The SHAKE functions are recommended for most new uses. They can produce
-// output of arbitrary length. SHAKE256, with an output length of at least
-// 64 bytes, provides 256-bit security against all attacks. The Keccak team
-// recommends it for most applications upgrading from SHA2-512. (NIST chose a
-// much stronger, but much slower, sponge instance for SHA3-512.)
-//
-// The SHA-3 functions are "drop-in" replacements for the SHA-2 functions.
-// They produce output of the same length, with the same security strengths
-// against all attacks. This means, in particular, that SHA3-256 only has
-// 128-bit collision resistance, because its output length is 32 bytes.
-package sha3 // import "golang.org/x/crypto/sha3"
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/sha3/hashes.go
--
diff --git a/cli/vendor/golang.org/x/crypto/sha3/hashes.go
b/cli/vendor/golang.org/x/crypto/sha3/hashes.go
deleted file mode 100644
index 2b51cf4..000
--- a/cli/vendor/golang.org/x/crypto/sha3/hashes.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// This file provides functions for creating instances of the SHA-3
-// and SHAKE hash functions, as well as utility functions for hashing
-// bytes.
-
-import (
- "hash"
-)
-
-// New224 creates a new SHA3-224 hash.
-// Its generic security strength is 224 bits against preimage attacks,
-// and 112 bits against collision attacks.
-func New224() hash.Hash { return {rate: 144, outputLen: 28, dsbyte:
0x06} }
-
-// New256 creates a new SHA3-256 hash.
-// Its generic security strength is 256 bits against preimage attacks,
-// and 128 bits against collision attacks.
-func New256() hash.Hash { return {rate: 136, outputLen: 32, dsbyte:
0x06} }
-
-// New384 creates a new SHA3-384 hash.
-// Its generic security
[16/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/cast5/cast5.go
--
diff --git a/cli/vendor/golang.org/x/crypto/cast5/cast5.go
b/cli/vendor/golang.org/x/crypto/cast5/cast5.go
deleted file mode 100644
index 0b4af37..000
--- a/cli/vendor/golang.org/x/crypto/cast5/cast5.go
+++ /dev/null
@@ -1,526 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cast5 implements CAST5, as defined in RFC 2144. CAST5 is a common
-// OpenPGP cipher.
-package cast5 // import "golang.org/x/crypto/cast5"
-
-import "errors"
-
-const BlockSize = 8
-const KeySize = 16
-
-type Cipher struct {
- masking [16]uint32
- rotate [16]uint8
-}
-
-func NewCipher(key []byte) (c *Cipher, err error) {
- if len(key) != KeySize {
- return nil, errors.New("CAST5: keys must be 16 bytes")
- }
-
- c = new(Cipher)
- c.keySchedule(key)
- return
-}
-
-func (c *Cipher) BlockSize() int {
- return BlockSize
-}
-
-func (c *Cipher) Encrypt(dst, src []byte) {
- l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 |
uint32(src[3])
- r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 |
uint32(src[7])
-
- l, r = r, l^f1(r, c.masking[0], c.rotate[0])
- l, r = r, l^f2(r, c.masking[1], c.rotate[1])
- l, r = r, l^f3(r, c.masking[2], c.rotate[2])
- l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-
- l, r = r, l^f2(r, c.masking[4], c.rotate[4])
- l, r = r, l^f3(r, c.masking[5], c.rotate[5])
- l, r = r, l^f1(r, c.masking[6], c.rotate[6])
- l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-
- l, r = r, l^f3(r, c.masking[8], c.rotate[8])
- l, r = r, l^f1(r, c.masking[9], c.rotate[9])
- l, r = r, l^f2(r, c.masking[10], c.rotate[10])
- l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-
- l, r = r, l^f1(r, c.masking[12], c.rotate[12])
- l, r = r, l^f2(r, c.masking[13], c.rotate[13])
- l, r = r, l^f3(r, c.masking[14], c.rotate[14])
- l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-
- dst[0] = uint8(r >> 24)
- dst[1] = uint8(r >> 16)
- dst[2] = uint8(r >> 8)
- dst[3] = uint8(r)
- dst[4] = uint8(l >> 24)
- dst[5] = uint8(l >> 16)
- dst[6] = uint8(l >> 8)
- dst[7] = uint8(l)
-}
-
-func (c *Cipher) Decrypt(dst, src []byte) {
- l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 |
uint32(src[3])
- r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 |
uint32(src[7])
-
- l, r = r, l^f1(r, c.masking[15], c.rotate[15])
- l, r = r, l^f3(r, c.masking[14], c.rotate[14])
- l, r = r, l^f2(r, c.masking[13], c.rotate[13])
- l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-
- l, r = r, l^f3(r, c.masking[11], c.rotate[11])
- l, r = r, l^f2(r, c.masking[10], c.rotate[10])
- l, r = r, l^f1(r, c.masking[9], c.rotate[9])
- l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-
- l, r = r, l^f2(r, c.masking[7], c.rotate[7])
- l, r = r, l^f1(r, c.masking[6], c.rotate[6])
- l, r = r, l^f3(r, c.masking[5], c.rotate[5])
- l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-
- l, r = r, l^f1(r, c.masking[3], c.rotate[3])
- l, r = r, l^f3(r, c.masking[2], c.rotate[2])
- l, r = r, l^f2(r, c.masking[1], c.rotate[1])
- l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-
- dst[0] = uint8(r >> 24)
- dst[1] = uint8(r >> 16)
- dst[2] = uint8(r >> 8)
- dst[3] = uint8(r)
- dst[4] = uint8(l >> 24)
- dst[5] = uint8(l >> 16)
- dst[6] = uint8(l >> 8)
- dst[7] = uint8(l)
-}
-
-type keyScheduleA [4][7]uint8
-type keyScheduleB [4][5]uint8
-
-// keyScheduleRound contains the magic values for a round of the key schedule.
-// The keyScheduleA deals with the lines like:
-// z0z1z2z3 = x0x1x2x3 ^ S5[xD] ^ S6[xF] ^ S7[xC] ^ S8[xE] ^ S7[x8]
-// Conceptually, both x and z are in the same array, x first. The first
-// element describes which word of this array gets written to and the
-// second, which word gets read. So, for the line above, it's "4, 0", because
-// it's writing to the first word of z, which, being after x, is word 4, and
-// reading from the first word of x: word 0.
-//
-// Next are the indexes into the S-boxes. Now the array is treated as bytes. So
-// "xD" is 0xd. The first byte of z is written as "16 + 0", just to be clear
-// that it's z that we're indexing.
-//
-// keyScheduleB deals with lines like:
-// K1 = S5[z8] ^ S6[z9] ^ S7[z7] ^ S8[z6] ^ S5[z2]
-// "K1" is ignored because key words are always written in order. So the five
-// elements are the S-box indexes. They use the same form as in keyScheduleA,
-// above.
-
-type keyScheduleRound struct{}
-type
[01/21] brooklyn-client git commit: Switch to dep for dependency management
Repository: brooklyn-client
Updated Branches:
refs/heads/master d8ef28462 -> 45beb3190
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
b/cli/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
deleted file mode 100644
index f1fc50b..000
--- a/cli/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd plan9
-
-package test
-
-// functional test harness for unix.
-
-import (
- "bytes"
- "fmt"
- "io/ioutil"
- "log"
- "net"
- "os"
- "os/exec"
- "os/user"
- "path/filepath"
- "testing"
- "text/template"
-
- "golang.org/x/crypto/ssh"
- "golang.org/x/crypto/ssh/testdata"
-)
-
-const sshd_config = `
-Protocol 2
-HostKey {{.Dir}}/id_rsa
-HostKey {{.Dir}}/id_dsa
-HostKey {{.Dir}}/id_ecdsa
-Pidfile {{.Dir}}/sshd.pid
-#UsePrivilegeSeparation no
-KeyRegenerationInterval 3600
-ServerKeyBits 768
-SyslogFacility AUTH
-LogLevel DEBUG2
-LoginGraceTime 120
-PermitRootLogin no
-StrictModes no
-RSAAuthentication yes
-PubkeyAuthentication yes
-AuthorizedKeysFile {{.Dir}}/id_user.pub
-TrustedUserCAKeys {{.Dir}}/id_ecdsa.pub
-IgnoreRhosts yes
-RhostsRSAAuthentication no
-HostbasedAuthentication no
-`
-
-var configTmpl = template.Must(template.New("").Parse(sshd_config))
-
-type server struct {
- t *testing.T
- cleanupfunc() // executed during Shutdown
- configfile string
- cmd*exec.Cmd
- output bytes.Buffer // holds stderr from sshd process
-
- // Client half of the network connection.
- clientConn net.Conn
-}
-
-func username() string {
- var username string
- if user, err := user.Current(); err == nil {
- username = user.Username
- } else {
- // user.Current() currently requires cgo. If an error is
- // returned attempt to get the username from the environment.
- log.Printf("user.Current: %v; falling back on $USER", err)
- username = os.Getenv("USER")
- }
- if username == "" {
- panic("Unable to get username")
- }
- return username
-}
-
-type storedHostKey struct {
- // keys map from an algorithm string to binary key data.
- keys map[string][]byte
-
- // checkCount counts the Check calls. Used for testing
- // rekeying.
- checkCount int
-}
-
-func (k *storedHostKey) Add(key ssh.PublicKey) {
- if k.keys == nil {
- k.keys = map[string][]byte{}
- }
- k.keys[key.Type()] = key.Marshal()
-}
-
-func (k *storedHostKey) Check(addr string, remote net.Addr, key ssh.PublicKey)
error {
- k.checkCount++
- algo := key.Type()
-
- if k.keys == nil || bytes.Compare(key.Marshal(), k.keys[algo]) != 0 {
- return fmt.Errorf("host key mismatch. Got %q, want %q", key,
k.keys[algo])
- }
- return nil
-}
-
-func hostKeyDB() *storedHostKey {
- keyChecker := {}
- keyChecker.Add(testPublicKeys["ecdsa"])
- keyChecker.Add(testPublicKeys["rsa"])
- keyChecker.Add(testPublicKeys["dsa"])
- return keyChecker
-}
-
-func clientConfig() *ssh.ClientConfig {
- config := {
- User: username(),
- Auth: []ssh.AuthMethod{
- ssh.PublicKeys(testSigners["user"]),
- },
- HostKeyCallback: hostKeyDB().Check,
- }
- return config
-}
-
-// unixConnection creates two halves of a connected net.UnixConn. It
-// is used for connecting the Go SSH client with sshd without opening
-// ports.
-func unixConnection() (*net.UnixConn, *net.UnixConn, error) {
- dir, err := ioutil.TempDir("", "unixConnection")
- if err != nil {
- return nil, nil, err
- }
- defer os.Remove(dir)
-
- addr := filepath.Join(dir, "ssh")
- listener, err := net.Listen("unix", addr)
- if err != nil {
- return nil, nil, err
- }
- defer listener.Close()
- c1, err := net.Dial("unix", addr)
- if err != nil {
- return nil, nil, err
- }
-
- c2, err := listener.Accept()
- if err != nil {
- c1.Close()
- return nil, nil, err
- }
-
- return c1.(*net.UnixConn), c2.(*net.UnixConn), nil
-}
-
-func (s *server) TryDial(config *ssh.ClientConfig) (*ssh.Client, error) {
- sshd, err := exec.LookPath("sshd")
- if err != nil {
- s.t.Skipf("skipping test: %v", err)
- }
-
-
[08/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
--
diff --git a/cli/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
b/cli/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
deleted file mode 100644
index 8c70902..000
--- a/cli/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package rc2 implements the RC2 cipher
-/*
-https://www.ietf.org/rfc/rfc2268.txt
-http://people.csail.mit.edu/rivest/pubs/KRRR98.pdf
-
-This code is licensed under the MIT license.
-*/
-package rc2
-
-import (
- "crypto/cipher"
- "encoding/binary"
-)
-
-// The rc2 block size in bytes
-const BlockSize = 8
-
-type rc2Cipher struct {
- k [64]uint16
-}
-
-// New returns a new rc2 cipher with the given key and effective key length t1
-func New(key []byte, t1 int) (cipher.Block, error) {
- // TODO(dgryski): error checking for key length
- return {
- k: expandKey(key, t1),
- }, nil
-}
-
-func (*rc2Cipher) BlockSize() int { return BlockSize }
-
-var piTable = [256]byte{
- 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,
0x4a, 0xa0, 0xd8, 0x9d,
- 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, 0x62, 0x4c, 0x64, 0x88,
0x44, 0x8b, 0xfb, 0xa2,
- 0x17, 0x9a, 0x59, 0xf5, 0x87, 0xb3, 0x4f, 0x13, 0x61, 0x45, 0x6d, 0x8d,
0x09, 0x81, 0x7d, 0x32,
- 0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, 0xf0, 0x95, 0x21, 0x22,
0x5c, 0x6b, 0x4e, 0x82,
- 0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c, 0x73, 0x56, 0xc0, 0x14,
0xa7, 0x8c, 0xf1, 0xdc,
- 0x12, 0x75, 0xca, 0x1f, 0x3b, 0xbe, 0xe4, 0xd1, 0x42, 0x3d, 0xd4, 0x30,
0xa3, 0x3c, 0xb6, 0x26,
- 0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, 0x27, 0xf2, 0x1d, 0x9b,
0xbc, 0x94, 0x43, 0x03,
- 0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7, 0x06, 0xc3, 0xd5, 0x2f,
0xc8, 0x66, 0x1e, 0xd7,
- 0x08, 0xe8, 0xea, 0xde, 0x80, 0x52, 0xee, 0xf7, 0x84, 0xaa, 0x72, 0xac,
0x35, 0x4d, 0x6a, 0x2a,
- 0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, 0x4b, 0x9f, 0xd0, 0x5e,
0x04, 0x18, 0xa4, 0xec,
- 0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc, 0x24, 0x91, 0xaf, 0x50,
0xa1, 0xf4, 0x70, 0x39,
- 0x99, 0x7c, 0x3a, 0x85, 0x23, 0xb8, 0xb4, 0x7a, 0xfc, 0x02, 0x36, 0x5b,
0x25, 0x55, 0x97, 0x31,
- 0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, 0x05, 0xdf, 0x29, 0x10,
0x67, 0x6c, 0xba, 0xc9,
- 0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c, 0x63, 0x16, 0x01, 0x3f,
0x58, 0xe2, 0x89, 0xa9,
- 0x0d, 0x38, 0x34, 0x1b, 0xab, 0x33, 0xff, 0xb0, 0xbb, 0x48, 0x0c, 0x5f,
0xb9, 0xb1, 0xcd, 0x2e,
- 0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, 0x0a, 0xa6, 0x20, 0x68,
0xfe, 0x7f, 0xc1, 0xad,
-}
-
-func expandKey(key []byte, t1 int) [64]uint16 {
-
- l := make([]byte, 128)
- copy(l, key)
-
- var t = len(key)
- var t8 = (t1 + 7) / 8
- var tm = byte(255 % uint(1<<(8+uint(t1)-8*uint(t8
-
- for i := len(key); i < 128; i++ {
- l[i] = piTable[l[i-1]+l[uint8(i-t)]]
- }
-
- l[128-t8] = piTable[l[128-t8]]
-
- for i := 127 - t8; i >= 0; i-- {
- l[i] = piTable[l[i+1]^l[i+t8]]
- }
-
- var k [64]uint16
-
- for i := range k {
- k[i] = uint16(l[2*i]) + uint16(l[2*i+1])*256
- }
-
- return k
-}
-
-func rotl16(x uint16, b uint) uint16 {
- return (x >> (16 - b)) | (x << b)
-}
-
-func (c *rc2Cipher) Encrypt(dst, src []byte) {
-
- r0 := binary.LittleEndian.Uint16(src[0:])
- r1 := binary.LittleEndian.Uint16(src[2:])
- r2 := binary.LittleEndian.Uint16(src[4:])
- r3 := binary.LittleEndian.Uint16(src[6:])
-
- var j int
-
- for j <= 16 {
- // mix r0
- r0 = r0 + c.k[j] + (r3 & r2) + ((^r3) & r1)
- r0 = rotl16(r0, 1)
- j++
-
- // mix r1
- r1 = r1 + c.k[j] + (r0 & r3) + ((^r0) & r2)
- r1 = rotl16(r1, 2)
- j++
-
- // mix r2
- r2 = r2 + c.k[j] + (r1 & r0) + ((^r1) & r3)
- r2 = rotl16(r2, 3)
- j++
-
- // mix r3
- r3 = r3 + c.k[j] + (r2 & r1) + ((^r2) & r0)
- r3 = rotl16(r3, 5)
- j++
-
- }
-
- r0 = r0 + c.k[r3&63]
- r1 = r1 + c.k[r0&63]
- r2 = r2 + c.k[r1&63]
- r3 = r3 + c.k[r2&63]
-
- for j <= 40 {
-
- // mix r0
- r0 = r0 + c.k[j] + (r3 & r2) + ((^r3) & r1)
- r0 = rotl16(r0, 1)
- j++
-
- // mix r1
- r1 = r1 + c.k[j] + (r0 & r3) + ((^r0)
[10/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/openpgp/read_test.go
--
diff --git a/cli/vendor/golang.org/x/crypto/openpgp/read_test.go
b/cli/vendor/golang.org/x/crypto/openpgp/read_test.go
deleted file mode 100644
index 7524a02..000
--- a/cli/vendor/golang.org/x/crypto/openpgp/read_test.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
- "bytes"
- _ "crypto/sha512"
- "encoding/hex"
- "io"
- "io/ioutil"
- "strings"
- "testing"
-
- "golang.org/x/crypto/openpgp/errors"
-)
-
-func readerFromHex(s string) io.Reader {
- data, err := hex.DecodeString(s)
- if err != nil {
- panic("readerFromHex: bad input")
- }
- return bytes.NewBuffer(data)
-}
-
-func TestReadKeyRing(t *testing.T) {
- kring, err := ReadKeyRing(readerFromHex(testKeys1And2Hex))
- if err != nil {
- t.Error(err)
- return
- }
- if len(kring) != 2 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB
|| uint32(kring[1].PrimaryKey.KeyId) != 0x1E35246B {
- t.Errorf("bad keyring: %#v", kring)
- }
-}
-
-func TestRereadKeyRing(t *testing.T) {
- kring, err := ReadKeyRing(readerFromHex(testKeys1And2Hex))
- if err != nil {
- t.Errorf("error in initial parse: %s", err)
- return
- }
- out := new(bytes.Buffer)
- err = kring[0].Serialize(out)
- if err != nil {
- t.Errorf("error in serialization: %s", err)
- return
- }
- kring, err = ReadKeyRing(out)
- if err != nil {
- t.Errorf("error in second parse: %s", err)
- return
- }
-
- if len(kring) != 1 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB {
- t.Errorf("bad keyring: %#v", kring)
- }
-}
-
-func TestReadPrivateKeyRing(t *testing.T) {
- kring, err := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
- if err != nil {
- t.Error(err)
- return
- }
- if len(kring) != 2 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB
|| uint32(kring[1].PrimaryKey.KeyId) != 0x1E35246B || kring[0].PrimaryKey ==
nil {
- t.Errorf("bad keyring: %#v", kring)
- }
-}
-
-func TestReadDSAKey(t *testing.T) {
- kring, err := ReadKeyRing(readerFromHex(dsaTestKeyHex))
- if err != nil {
- t.Error(err)
- return
- }
- if len(kring) != 1 || uint32(kring[0].PrimaryKey.KeyId) != 0x0CCC0360 {
- t.Errorf("bad parse: %#v", kring)
- }
-}
-
-func TestDSAHashTruncatation(t *testing.T) {
- // dsaKeyWithSHA512 was generated with GnuPG and --cert-digest-algo
- // SHA512 in order to require DSA hash truncation to verify correctly.
- _, err := ReadKeyRing(readerFromHex(dsaKeyWithSHA512))
- if err != nil {
- t.Error(err)
- }
-}
-
-func TestGetKeyById(t *testing.T) {
- kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-
- keys := kring.KeysById(0xa34d7e18c20c31bb)
- if len(keys) != 1 || keys[0].Entity != kring[0] {
- t.Errorf("bad result for 0xa34d7e18c20c31bb: %#v", keys)
- }
-
- keys = kring.KeysById(0xfd94408d4543314f)
- if len(keys) != 1 || keys[0].Entity != kring[0] {
- t.Errorf("bad result for 0xa34d7e18c20c31bb: %#v", keys)
- }
-}
-
-func checkSignedMessage(t *testing.T, signedHex, expected string) {
- kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-
- md, err := ReadMessage(readerFromHex(signedHex), kring, nil, nil)
- if err != nil {
- t.Error(err)
- return
- }
-
- if !md.IsSigned || md.SignedByKeyId != 0xa34d7e18c20c31bb ||
md.SignedBy == nil || md.IsEncrypted || md.IsSymmetricallyEncrypted ||
len(md.EncryptedToKeyIds) != 0 || md.IsSymmetricallyEncrypted {
- t.Errorf("bad MessageDetails: %#v", md)
- }
-
- contents, err := ioutil.ReadAll(md.UnverifiedBody)
- if err != nil {
- t.Errorf("error reading UnverifiedBody: %s", err)
- }
- if string(contents) != expected {
- t.Errorf("bad UnverifiedBody got:%s want:%s", string(contents),
expected)
- }
- if md.SignatureError != nil || md.Signature == nil {
- t.Errorf("failed to validate: %s", md.SignatureError)
- }
-}
-
-func TestSignedMessage(t *testing.T) {
- checkSignedMessage(t, signedMessageHex, signedInput)
-}
-
-func TestTextSignedMessage(t *testing.T) {
- checkSignedMessage(t, signedTextMessageHex, signedTextInput)
-}
-
-// The reader
[02/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/ssh/server.go
--
diff --git a/cli/vendor/golang.org/x/crypto/ssh/server.go
b/cli/vendor/golang.org/x/crypto/ssh/server.go
deleted file mode 100644
index 4781eb7..000
--- a/cli/vendor/golang.org/x/crypto/ssh/server.go
+++ /dev/null
@@ -1,495 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
- "bytes"
- "errors"
- "fmt"
- "io"
- "net"
-)
-
-// The Permissions type holds fine-grained permissions that are
-// specific to a user or a specific authentication method for a
-// user. Permissions, except for "source-address", must be enforced in
-// the server application layer, after successful authentication. The
-// Permissions are passed on in ServerConn so a server implementation
-// can honor them.
-type Permissions struct {
- // Critical options restrict default permissions. Common
- // restrictions are "source-address" and "force-command". If
- // the server cannot enforce the restriction, or does not
- // recognize it, the user should not authenticate.
- CriticalOptions map[string]string
-
- // Extensions are extra functionality that the server may
- // offer on authenticated connections. Common extensions are
- // "permit-agent-forwarding", "permit-X11-forwarding". Lack of
- // support for an extension does not preclude authenticating a
- // user.
- Extensions map[string]string
-}
-
-// ServerConfig holds server specific configuration data.
-type ServerConfig struct {
- // Config contains configuration shared between client and server.
- Config
-
- hostKeys []Signer
-
- // NoClientAuth is true if clients are allowed to connect without
- // authenticating.
- NoClientAuth bool
-
- // PasswordCallback, if non-nil, is called when a user
- // attempts to authenticate using a password.
- PasswordCallback func(conn ConnMetadata, password []byte)
(*Permissions, error)
-
- // PublicKeyCallback, if non-nil, is called when a client attempts
public
- // key authentication. It must return true if the given public key is
- // valid for the given user. For example, see CertChecker.Authenticate.
- PublicKeyCallback func(conn ConnMetadata, key PublicKey) (*Permissions,
error)
-
- // KeyboardInteractiveCallback, if non-nil, is called when
- // keyboard-interactive authentication is selected (RFC
- // 4256). The client object's Challenge function should be
- // used to query the user. The callback may offer multiple
- // Challenge rounds. To avoid information leaks, the client
- // should be presented a challenge even if the user is
- // unknown.
- KeyboardInteractiveCallback func(conn ConnMetadata, client
KeyboardInteractiveChallenge) (*Permissions, error)
-
- // AuthLogCallback, if non-nil, is called to log all authentication
- // attempts.
- AuthLogCallback func(conn ConnMetadata, method string, err error)
-
- // ServerVersion is the version identification string to announce in
- // the public handshake.
- // If empty, a reasonable default is used.
- // Note that RFC 4253 section 4.2 requires that this string start with
- // "SSH-2.0-".
- ServerVersion string
-}
-
-// AddHostKey adds a private key as a host key. If an existing host
-// key exists with the same algorithm, it is overwritten. Each server
-// config must have at least one host key.
-func (s *ServerConfig) AddHostKey(key Signer) {
- for i, k := range s.hostKeys {
- if k.PublicKey().Type() == key.PublicKey().Type() {
- s.hostKeys[i] = key
- return
- }
- }
-
- s.hostKeys = append(s.hostKeys, key)
-}
-
-// cachedPubKey contains the results of querying whether a public key is
-// acceptable for a user.
-type cachedPubKey struct {
- user string
- pubKeyData []byte
- result error
- perms *Permissions
-}
-
-const maxCachedPubKeys = 16
-
-// pubKeyCache caches tests for public keys. Since SSH clients
-// will query whether a public key is acceptable before attempting to
-// authenticate with it, we end up with duplicate queries for public
-// key validity. The cache only applies to a single ServerConn.
-type pubKeyCache struct {
- keys []cachedPubKey
-}
-
-// get returns the result for a given user/algo/key tuple.
-func (c *pubKeyCache) get(user string, pubKeyData []byte) (cachedPubKey, bool)
{
- for _, k := range c.keys {
- if k.user == user && bytes.Equal(k.pubKeyData, pubKeyData) {
- return k, true
[07/21] brooklyn-client git commit: Switch to dep for dependency management
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/868863aa/cli/vendor/golang.org/x/crypto/poly1305/sum_ref.go
--
diff --git a/cli/vendor/golang.org/x/crypto/poly1305/sum_ref.go
b/cli/vendor/golang.org/x/crypto/poly1305/sum_ref.go
deleted file mode 100644
index 0b24fc7..000
--- a/cli/vendor/golang.org/x/crypto/poly1305/sum_ref.go
+++ /dev/null
@@ -1,1531 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64,!arm gccgo appengine
-
-package poly1305
-
-// Based on original, public domain implementation from NaCl by D. J.
-// Bernstein.
-
-import "math"
-
-const (
- alpham80 = 0.558793544769287109375
- alpham48 = 24.0
- alpham16 = 103079215104.0
- alpha0 = 6755399441055744.0
- alpha18 = 1770887431076116955136.0
- alpha32 = 29014219670751100192948224.0
- alpha50 = 7605903601369376408980219232256.0
- alpha64 = 124615124604835863084731911901282304.0
- alpha82 = 32667107224410092492483962313449748299776.0
- alpha96 = 535217884764734955396857238543560676143529984.0
- alpha112 = 35076039295941670036888435985190792471742381031424.0
- alpha130 = 9194973245195333150150082162901855101712434733101613056.0
- scale=
0.0036734198463196484624023016788195177431833298649127735047148490821200539357960224151611328125
- offset0 = 6755408030990331.0
- offset1 = 29014256564239239022116864.0
- offset2 = 124615283061160854719918951570079744.0
- offset3 = 535219245894202480694386063513315216128475136.0
-)
-
-// Sum generates an authenticator for m using a one-time key and puts the
-// 16-byte result into out. Authenticating two different messages with the same
-// key allows an attacker to forge messages at will.
-func Sum(out *[16]byte, m []byte, key *[32]byte) {
- r := key
- s := key[16:]
- var (
- y7float64
- y6float64
- y1float64
- y0float64
- y5float64
- y4float64
- x7float64
- x6float64
- x1float64
- x0float64
- y3float64
- y2float64
- x5float64
- r3lowx0 float64
- x4float64
- r0lowx6 float64
- x3float64
- r3highx0 float64
- x2float64
- r0highx6 float64
- r0lowx0 float64
- sr1lowx6 float64
- r0highx0 float64
- sr1highx6 float64
- sr3lowfloat64
- r1lowx0 float64
- sr2lowx6 float64
- r1highx0 float64
- sr2highx6 float64
- r2lowx0 float64
- sr3lowx6 float64
- r2highx0 float64
- sr3highx6 float64
- r1highx4 float64
- r1lowx4 float64
- r0highx4 float64
- r0lowx4 float64
- sr3highx4 float64
- sr3lowx4 float64
- sr2highx4 float64
- sr2lowx4 float64
- r0lowx2 float64
- r0highx2 float64
- r1lowx2 float64
- r1highx2 float64
- r2lowx2 float64
- r2highx2 float64
- sr3lowx2 float64
- sr3highx2 float64
- z0float64
- z1float64
- z2float64
- z3float64
- m0int64
- m1int64
- m2int64
- m3int64
- m00 uint32
- m01 uint32
- m02 uint32
- m03 uint32
- m10 uint32
- m11 uint32
- m12 uint32
- m13 uint32
- m20 uint32
- m21 uint32
- m22 uint32
- m23 uint32
- m30 uint32
- m31 uint32
- m32 uint32
- m33 uint64
- lbelow2 int32
- lbelow3 int32
- lbelow4 int32
- lbelow5 int32
- lbelow6 int32
- lbelow7 int32
- lbelow8 int32
- lbelow9 int32
- lbelow10 int32
- lbelow11 int32
- lbelow12 int32
- lbelow13 int32
- lbelow14 int32
- lbelow15
