diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index 0565f5c85bc..f940b9c43e3 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -24,6 +24,7 @@ - Now `go get/install/build` on `etcd` packages (e.g. `clientv3`, `tools/benchmark`) enforce builds with etcd `vendor` directory. - Reorganize [internal packages](https://github.com/coreos/etcd/issues/9220). - Move `"github.com/coreos/etcd/alarm"` to [`"github.com/coreos/etcd/internal/alarm"`](https://github.com/coreos/etcd/pull/9234). + - Move `"github.com/coreos/etcd/auth"` to [`"github.com/coreos/etcd/internal/auth"`](https://github.com/coreos/etcd/pull/9243). - Move `"github.com/coreos/etcd/compactor"` to [`"github.com/coreos/etcd/internal/compactor"`](https://github.com/coreos/etcd/pull/9234). - Move `"github.com/coreos/etcd/discovery"` to [`"github.com/coreos/etcd/internal/discovery"`](https://github.com/coreos/etcd/pull/9233). - Move `"github.com/coreos/etcd/lease"` to [`"github.com/coreos/etcd/internal/lease"`](https://github.com/coreos/etcd/pull/9238). diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index 33cb2583e87..bf80cede9b2 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -910,7 +910,7 @@ From google paxosdb paper: Our implementation hinges around a powerful primitive -##### message `Permission` (auth/authpb/auth.proto) +##### message `Permission` (internal/auth/authpb/auth.proto) Permission is a single entity @@ -922,7 +922,7 @@ Permission is a single entity -##### message `Role` (auth/authpb/auth.proto) +##### message `Role` (internal/auth/authpb/auth.proto) Role is a single entry in the bucket authRoles @@ -933,7 +933,7 @@ Role is a single entry in the bucket authRoles -##### message `User` (auth/authpb/auth.proto) +##### message `User` (internal/auth/authpb/auth.proto) User is a single entry in the bucket authUsers diff --git a/clientv3/auth.go b/clientv3/auth.go index 7545bb6ca1c..6ffe48b0caf 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/auth/authpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth/authpb" "google.golang.org/grpc" ) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index 89b30860b82..cf5e6d69774 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth" "github.com/coreos/etcd/integration" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/pkg/testutil" "golang.org/x/crypto/bcrypt" ) diff --git a/embed/serve_test.go b/embed/serve_test.go index d46631fcfde..55274d98894 100644 --- a/embed/serve_test.go +++ b/embed/serve_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/auth" + "github.com/coreos/etcd/internal/auth" ) // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error. diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 18ed30a593b..9b402aa0d62 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -19,10 +19,10 @@ import ( "crypto/sha256" "io" - "github.com/coreos/etcd/auth" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/pkg/types" diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go index bd092b3a1cc..5ad962a6a76 100644 --- a/etcdserver/api/v3rpc/util.go +++ b/etcdserver/api/v3rpc/util.go @@ -18,10 +18,10 @@ import ( "context" "strings" - "github.com/coreos/etcd/auth" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index d8e05ee504a..65ad02d1322 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -20,10 +20,10 @@ import ( "sync" "time" - "github.com/coreos/etcd/auth" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/mvccpb" ) diff --git a/etcdserver/apply.go b/etcdserver/apply.go index a79099294cc..93f5ed04cf5 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -20,8 +20,8 @@ import ( "sort" "time" - "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/mvccpb" diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index d95385af3ba..9f3516ee1cc 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -17,8 +17,8 @@ package etcdserver import ( "sync" - "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/mvcc" ) diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index ce9e87c2a58..399a23a457f 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -14,7 +14,7 @@ import ( mvccpb "github.com/coreos/etcd/internal/mvcc/mvccpb" - authpb "github.com/coreos/etcd/auth/authpb" + authpb "github.com/coreos/etcd/internal/auth/authpb" context "golang.org/x/net/context" @@ -18573,230 +18573,230 @@ var fileDescriptorRpc = []byte{ 0x5b, 0x94, 0x67, 0x02, 0x6c, 0x22, 0xb4, 0xc8, 0x92, 0xd4, 0x11, 0xd9, 0xcd, 0x74, 0x37, 0x69, 0xc9, 0x59, 0x24, 0xc0, 0x66, 0x13, 0xe4, 0x25, 0x79, 0xc8, 0x02, 0x41, 0x92, 0xd7, 0x20, 0x58, 0xec, 0x0f, 0x18, 0xe4, 0x2f, 0xe4, 0x2d, 0x01, 0xf2, 0x07, 0x82, 0x49, 0x5e, 0xf2, 0x0b, 0x72, - 0x79, 0x5a, 0xd4, 0xad, 0xbb, 0xfa, 0x46, 0x69, 0x86, 0x33, 0xf3, 0x22, 0x77, 0x9d, 0x3a, 0x75, - 0xce, 0xa9, 0x53, 0x75, 0xce, 0xa9, 0xfa, 0x8a, 0x86, 0x92, 0x33, 0xec, 0xae, 0x0c, 0x1d, 0xdb, - 0xb3, 0x51, 0x85, 0x78, 0xdd, 0x9e, 0x4b, 0x9c, 0x31, 0x71, 0x86, 0xc7, 0xcd, 0x85, 0x53, 0xfb, - 0xd4, 0x66, 0x1d, 0x2d, 0xfa, 0xc5, 0x79, 0x9a, 0x98, 0xf2, 0xb4, 0x4c, 0xcb, 0x23, 0x8e, 0x65, - 0xf4, 0x5b, 0x83, 0x71, 0xb7, 0xcb, 0xfe, 0x0c, 0x8f, 0x5b, 0xe7, 0x63, 0xc1, 0x73, 0x97, 0xf1, - 0x18, 0x23, 0xef, 0x8c, 0xfd, 0x19, 0x1e, 0xb3, 0x7f, 0x44, 0xe7, 0xbd, 0x53, 0xdb, 0x3e, 0xed, - 0x93, 0x96, 0x31, 0x34, 0x5b, 0x86, 0x65, 0xd9, 0x9e, 0xe1, 0x99, 0xb6, 0xe5, 0xf2, 0x5e, 0xfc, - 0xe7, 0x1a, 0xd4, 0x74, 0xe2, 0x0e, 0x6d, 0xcb, 0x25, 0x9b, 0xc4, 0xe8, 0x11, 0x07, 0xdd, 0x07, - 0xe8, 0xf6, 0x47, 0xae, 0x47, 0x9c, 0x23, 0xb3, 0xd7, 0xd0, 0x96, 0xb4, 0xe5, 0x59, 0xbd, 0x24, - 0x28, 0x5b, 0x3d, 0x74, 0x17, 0x4a, 0x03, 0x32, 0x38, 0xe6, 0xbd, 0x19, 0xd6, 0x5b, 0xe4, 0x84, - 0xad, 0x1e, 0x6a, 0x42, 0xd1, 0x21, 0x63, 0xd3, 0x35, 0x6d, 0xab, 0x91, 0x5d, 0xd2, 0x96, 0xb3, - 0xba, 0xdf, 0xa6, 0x03, 0x1d, 0xe3, 0xc4, 0x3b, 0xf2, 0x88, 0x33, 0x68, 0xcc, 0xf2, 0x81, 0x94, - 0xd0, 0x21, 0xce, 0x00, 0xff, 0x22, 0x07, 0x15, 0xdd, 0xb0, 0x4e, 0x89, 0x4e, 0xfe, 0x68, 0x44, - 0x5c, 0x0f, 0xd5, 0x21, 0x7b, 0x4e, 0x2e, 0x99, 0xfa, 0x8a, 0x4e, 0x3f, 0xf9, 0x78, 0xeb, 0x94, - 0x1c, 0x11, 0x8b, 0x2b, 0xae, 0xd0, 0xf1, 0xd6, 0x29, 0x69, 0x5b, 0x3d, 0xb4, 0x00, 0xb9, 0xbe, - 0x39, 0x30, 0x3d, 0xa1, 0x95, 0x37, 0x42, 0xe6, 0xcc, 0x46, 0xcc, 0x59, 0x07, 0x70, 0x6d, 0xc7, - 0x3b, 0xb2, 0x9d, 0x1e, 0x71, 0x1a, 0xb9, 0x25, 0x6d, 0xb9, 0xb6, 0xfa, 0x78, 0x45, 0x5d, 0x91, - 0x15, 0xd5, 0xa0, 0x95, 0x03, 0xdb, 0xf1, 0xf6, 0x28, 0xaf, 0x5e, 0x72, 0xe5, 0x27, 0xfa, 0x11, - 0x94, 0x99, 0x10, 0xcf, 0x70, 0x4e, 0x89, 0xd7, 0xc8, 0x33, 0x29, 0x4f, 0xae, 0x90, 0xd2, 0x61, - 0xcc, 0x3a, 0x53, 0xcf, 0xbf, 0x11, 0x86, 0x8a, 0x4b, 0x1c, 0xd3, 0xe8, 0x9b, 0x1f, 0x8d, 0xe3, - 0x3e, 0x69, 0x14, 0x96, 0xb4, 0xe5, 0xa2, 0x1e, 0xa2, 0xd1, 0xf9, 0x9f, 0x93, 0x4b, 0xf7, 0xc8, - 0xb6, 0xfa, 0x97, 0x8d, 0x22, 0x63, 0x28, 0x52, 0xc2, 0x9e, 0xd5, 0xbf, 0x64, 0x8b, 0x66, 0x8f, - 0x2c, 0x8f, 0xf7, 0x96, 0x58, 0x6f, 0x89, 0x51, 0x58, 0xf7, 0x32, 0xd4, 0x07, 0xa6, 0x75, 0x34, - 0xb0, 0x7b, 0x47, 0xbe, 0x43, 0x80, 0x39, 0xa4, 0x36, 0x30, 0xad, 0x77, 0x76, 0x4f, 0x97, 0x6e, - 0xa1, 0x9c, 0xc6, 0x45, 0x98, 0xb3, 0x2c, 0x38, 0x8d, 0x0b, 0x95, 0x73, 0x05, 0xe6, 0xa9, 0xcc, - 0xae, 0x43, 0x0c, 0x8f, 0x04, 0xcc, 0x15, 0xc6, 0x7c, 0x63, 0x60, 0x5a, 0xeb, 0xac, 0x27, 0xc4, - 0x6f, 0x5c, 0xc4, 0xf8, 0xab, 0x82, 0xdf, 0xb8, 0x08, 0xf3, 0xe3, 0x15, 0x28, 0xf9, 0x3e, 0x47, - 0x45, 0x98, 0xdd, 0xdd, 0xdb, 0x6d, 0xd7, 0x67, 0x10, 0x40, 0x7e, 0xed, 0x60, 0xbd, 0xbd, 0xbb, - 0x51, 0xd7, 0x50, 0x19, 0x0a, 0x1b, 0x6d, 0xde, 0xc8, 0xe0, 0x37, 0x00, 0x81, 0x77, 0x51, 0x01, - 0xb2, 0xdb, 0xed, 0xdf, 0xab, 0xcf, 0x50, 0x9e, 0xf7, 0x6d, 0xfd, 0x60, 0x6b, 0x6f, 0xb7, 0xae, - 0xd1, 0xc1, 0xeb, 0x7a, 0x7b, 0xad, 0xd3, 0xae, 0x67, 0x28, 0xc7, 0xbb, 0xbd, 0x8d, 0x7a, 0x16, - 0x95, 0x20, 0xf7, 0x7e, 0x6d, 0xe7, 0xb0, 0x5d, 0x9f, 0xc5, 0xbf, 0xd4, 0xa0, 0x2a, 0xd6, 0x8b, - 0xc7, 0x04, 0xfa, 0x3e, 0xe4, 0xcf, 0x58, 0x5c, 0xb0, 0xad, 0x58, 0x5e, 0xbd, 0x17, 0x59, 0xdc, - 0x50, 0xec, 0xe8, 0x82, 0x17, 0x61, 0xc8, 0x9e, 0x8f, 0xdd, 0x46, 0x66, 0x29, 0xbb, 0x5c, 0x5e, - 0xad, 0xaf, 0xf0, 0x80, 0x5d, 0xd9, 0x26, 0x97, 0xef, 0x8d, 0xfe, 0x88, 0xe8, 0xb4, 0x13, 0x21, - 0x98, 0x1d, 0xd8, 0x0e, 0x61, 0x3b, 0xb6, 0xa8, 0xb3, 0x6f, 0xba, 0x8d, 0xd9, 0xa2, 0x89, 0xdd, - 0xca, 0x1b, 0xf8, 0xd7, 0x1a, 0xc0, 0xfe, 0xc8, 0x4b, 0x0f, 0x8d, 0x05, 0xc8, 0x8d, 0xa9, 0x60, - 0x11, 0x16, 0xbc, 0xc1, 0x62, 0x82, 0x18, 0x2e, 0xf1, 0x63, 0x82, 0x36, 0xd0, 0x6d, 0x28, 0x0c, - 0x1d, 0x32, 0x3e, 0x3a, 0x1f, 0x33, 0x25, 0x45, 0x3d, 0x4f, 0x9b, 0xdb, 0x63, 0xf4, 0x10, 0x2a, - 0xe6, 0xa9, 0x65, 0x3b, 0xe4, 0x88, 0xcb, 0xca, 0xb1, 0xde, 0x32, 0xa7, 0x31, 0xbb, 0x15, 0x16, - 0x2e, 0x38, 0xaf, 0xb2, 0xec, 0x50, 0x12, 0xb6, 0xa0, 0xcc, 0x4c, 0x9d, 0xca, 0x7d, 0xcf, 0x03, - 0x1b, 0x33, 0x6c, 0x58, 0xdc, 0x85, 0xc2, 0x6a, 0xfc, 0x53, 0x40, 0x1b, 0xa4, 0x4f, 0x3c, 0x32, - 0x4d, 0xf6, 0x50, 0x7c, 0x92, 0x55, 0x7d, 0x82, 0xff, 0x46, 0x83, 0xf9, 0x90, 0xf8, 0xa9, 0xa6, - 0xd5, 0x80, 0x42, 0x8f, 0x09, 0xe3, 0x16, 0x64, 0x75, 0xd9, 0x44, 0x2f, 0xa1, 0x28, 0x0c, 0x70, - 0x1b, 0xd9, 0x94, 0x4d, 0x53, 0xe0, 0x36, 0xb9, 0xf8, 0xd7, 0x19, 0x28, 0x89, 0x89, 0xee, 0x0d, - 0xd1, 0x1a, 0x54, 0x1d, 0xde, 0x38, 0x62, 0xf3, 0x11, 0x16, 0x35, 0xd3, 0x93, 0xd0, 0xe6, 0x8c, - 0x5e, 0x11, 0x43, 0x18, 0x19, 0xfd, 0x0e, 0x94, 0xa5, 0x88, 0xe1, 0xc8, 0x13, 0x2e, 0x6f, 0x84, - 0x05, 0x04, 0xfb, 0x6f, 0x73, 0x46, 0x07, 0xc1, 0xbe, 0x3f, 0xf2, 0x50, 0x07, 0x16, 0xe4, 0x60, - 0x3e, 0x1b, 0x61, 0x46, 0x96, 0x49, 0x59, 0x0a, 0x4b, 0x89, 0x2f, 0xd5, 0xe6, 0x8c, 0x8e, 0xc4, - 0x78, 0xa5, 0x53, 0x35, 0xc9, 0xbb, 0xe0, 0xc9, 0x3b, 0x66, 0x52, 0xe7, 0xc2, 0x8a, 0x9b, 0xd4, - 0xb9, 0xb0, 0xde, 0x94, 0xa0, 0x20, 0x5a, 0xf8, 0x9f, 0x33, 0x00, 0x72, 0x35, 0xf6, 0x86, 0x68, - 0x03, 0x6a, 0x8e, 0x68, 0x85, 0xbc, 0x75, 0x37, 0xd1, 0x5b, 0x62, 0x11, 0x67, 0xf4, 0xaa, 0x1c, - 0xc4, 0x8d, 0xfb, 0x01, 0x54, 0x7c, 0x29, 0x81, 0xc3, 0xee, 0x24, 0x38, 0xcc, 0x97, 0x50, 0x96, - 0x03, 0xa8, 0xcb, 0x3e, 0x85, 0x9b, 0xfe, 0xf8, 0x04, 0x9f, 0x3d, 0x9c, 0xe0, 0x33, 0x5f, 0xe0, - 0xbc, 0x94, 0xa0, 0x7a, 0x4d, 0x35, 0x2c, 0x70, 0xdb, 0x9d, 0x04, 0xb7, 0xc5, 0x0d, 0xa3, 0x8e, - 0x03, 0x5a, 0x2f, 0x79, 0x13, 0xff, 0x77, 0x16, 0x0a, 0xeb, 0xf6, 0x60, 0x68, 0x38, 0x74, 0x35, - 0xf2, 0x0e, 0x71, 0x47, 0x7d, 0x8f, 0xb9, 0xab, 0xb6, 0xfa, 0x28, 0x2c, 0x51, 0xb0, 0xc9, 0x7f, - 0x75, 0xc6, 0xaa, 0x8b, 0x21, 0x74, 0xb0, 0x28, 0x8f, 0x99, 0x6b, 0x0c, 0x16, 0xc5, 0x51, 0x0c, - 0x91, 0x81, 0x9c, 0x0d, 0x02, 0xb9, 0x09, 0x85, 0x31, 0x71, 0x82, 0x92, 0xbe, 0x39, 0xa3, 0x4b, - 0x02, 0x7a, 0x0e, 0x73, 0xd1, 0xf2, 0x92, 0x13, 0x3c, 0xb5, 0x6e, 0xb8, 0x1a, 0x3d, 0x82, 0x4a, - 0xa8, 0xc6, 0xe5, 0x05, 0x5f, 0x79, 0xa0, 0x94, 0xb8, 0x5b, 0x32, 0xaf, 0xd2, 0x7a, 0x5c, 0xd9, - 0x9c, 0x91, 0x99, 0xf5, 0x96, 0xcc, 0xac, 0x45, 0x31, 0x4a, 0xe4, 0xd6, 0x50, 0x92, 0xf9, 0x61, - 0x38, 0xc9, 0xe0, 0x1f, 0x42, 0x35, 0xe4, 0x20, 0x5a, 0x77, 0xda, 0x3f, 0x39, 0x5c, 0xdb, 0xe1, - 0x45, 0xea, 0x2d, 0xab, 0x4b, 0x7a, 0x5d, 0xa3, 0xb5, 0x6e, 0xa7, 0x7d, 0x70, 0x50, 0xcf, 0xa0, - 0x2a, 0x94, 0x76, 0xf7, 0x3a, 0x47, 0x9c, 0x2b, 0x8b, 0xdf, 0xfa, 0x12, 0x44, 0x91, 0x53, 0x6a, - 0xdb, 0x8c, 0x52, 0xdb, 0x34, 0x59, 0xdb, 0x32, 0x41, 0x6d, 0x63, 0x65, 0x6e, 0xa7, 0xbd, 0x76, - 0xd0, 0xae, 0xcf, 0xbe, 0xa9, 0x41, 0x85, 0xfb, 0xf7, 0x68, 0x64, 0xd1, 0x52, 0xfb, 0x8f, 0x1a, - 0x40, 0x10, 0x4d, 0xa8, 0x05, 0x85, 0x2e, 0xd7, 0xd3, 0xd0, 0x58, 0x32, 0xba, 0x99, 0xb8, 0x64, - 0xba, 0xe4, 0x42, 0xdf, 0x85, 0x82, 0x3b, 0xea, 0x76, 0x89, 0x2b, 0x4b, 0xde, 0xed, 0x68, 0x3e, - 0x14, 0xd9, 0x4a, 0x97, 0x7c, 0x74, 0xc8, 0x89, 0x61, 0xf6, 0x47, 0xac, 0x00, 0x4e, 0x1e, 0x22, - 0xf8, 0xf0, 0xdf, 0x6b, 0x50, 0x56, 0x36, 0xef, 0x57, 0x4c, 0xc2, 0xf7, 0xa0, 0xc4, 0x6c, 0x20, - 0x3d, 0x91, 0x86, 0x8b, 0x7a, 0x40, 0x40, 0xbf, 0x0d, 0x25, 0x19, 0x01, 0x32, 0x13, 0x37, 0x92, - 0xc5, 0xee, 0x0d, 0xf5, 0x80, 0x15, 0x6f, 0xc3, 0x0d, 0xe6, 0x95, 0x2e, 0x3d, 0x5c, 0x4b, 0x3f, - 0xaa, 0xc7, 0x4f, 0x2d, 0x72, 0xfc, 0x6c, 0x42, 0x71, 0x78, 0x76, 0xe9, 0x9a, 0x5d, 0xa3, 0x2f, - 0xac, 0xf0, 0xdb, 0xf8, 0xc7, 0x80, 0x54, 0x61, 0xd3, 0x4c, 0x17, 0x57, 0xa1, 0xbc, 0x69, 0xb8, - 0x67, 0xc2, 0x24, 0xfc, 0x12, 0xaa, 0xb4, 0xb9, 0xfd, 0xfe, 0x1a, 0x36, 0xb2, 0xcb, 0x81, 0xe4, - 0x9e, 0xca, 0xe7, 0x08, 0x66, 0xcf, 0x0c, 0xf7, 0x8c, 0x4d, 0xb4, 0xaa, 0xb3, 0x6f, 0xf4, 0x1c, - 0xea, 0x5d, 0x3e, 0xc9, 0xa3, 0xc8, 0x95, 0x61, 0x4e, 0xd0, 0xfd, 0x93, 0xe0, 0x67, 0x50, 0xe1, - 0x73, 0xf8, 0xba, 0x8d, 0xc0, 0x37, 0x60, 0xee, 0xc0, 0x32, 0x86, 0xee, 0x99, 0x2d, 0xab, 0x1b, - 0x9d, 0x74, 0x3d, 0xa0, 0x4d, 0xa5, 0xf1, 0x19, 0xcc, 0x39, 0x64, 0x60, 0x98, 0x96, 0x69, 0x9d, - 0x1e, 0x1d, 0x5f, 0x7a, 0xc4, 0x15, 0x17, 0xa6, 0x9a, 0x4f, 0x7e, 0x43, 0xa9, 0xd4, 0xb4, 0xe3, - 0xbe, 0x7d, 0x2c, 0xd2, 0x1c, 0xfb, 0xc6, 0x9f, 0x6b, 0x50, 0xf9, 0xd4, 0xf0, 0xba, 0x72, 0xe9, - 0xd0, 0x16, 0xd4, 0xfc, 0xe4, 0xc6, 0x28, 0xc2, 0x96, 0x48, 0x89, 0x65, 0x63, 0xe4, 0x51, 0x5a, - 0x56, 0xc7, 0x6a, 0x57, 0x25, 0x30, 0x51, 0x86, 0xd5, 0x25, 0x7d, 0x5f, 0x54, 0x26, 0x5d, 0x14, - 0x63, 0x54, 0x45, 0xa9, 0x84, 0x37, 0x73, 0xc1, 0xf1, 0x83, 0xe7, 0x92, 0xcf, 0x33, 0x80, 0xe2, - 0x36, 0x7c, 0xd9, 0x13, 0xd9, 0x13, 0xa8, 0xb9, 0x9e, 0xe1, 0xc4, 0xf6, 0x46, 0x95, 0x51, 0xfd, - 0x04, 0xfd, 0x0c, 0xe6, 0x86, 0x8e, 0x7d, 0xea, 0x10, 0xd7, 0x3d, 0xb2, 0x6c, 0xcf, 0x3c, 0xb9, - 0x14, 0x87, 0xda, 0x9a, 0x24, 0xef, 0x32, 0x2a, 0x6a, 0x43, 0xe1, 0xc4, 0xec, 0x7b, 0xc4, 0x71, - 0x1b, 0xb9, 0xa5, 0xec, 0x72, 0x6d, 0xf5, 0xe5, 0x55, 0x5e, 0x5b, 0xf9, 0x11, 0xe3, 0xef, 0x5c, - 0x0e, 0x89, 0x2e, 0xc7, 0xaa, 0x07, 0xc5, 0x7c, 0xe8, 0xf0, 0x7c, 0x07, 0x8a, 0x1f, 0xa8, 0x08, - 0x7a, 0x29, 0x2e, 0xf0, 0xb3, 0x1d, 0x6b, 0x6f, 0xf5, 0xf0, 0x13, 0x80, 0x40, 0x14, 0xcd, 0xc2, - 0xbb, 0x7b, 0xfb, 0x87, 0x9d, 0xfa, 0x0c, 0xaa, 0x40, 0x71, 0x77, 0x6f, 0xa3, 0xbd, 0xd3, 0xa6, - 0x29, 0x1b, 0xb7, 0xa4, 0xdb, 0x54, 0xf7, 0x86, 0xe4, 0x6a, 0x61, 0xb9, 0x7f, 0x95, 0x81, 0xaa, - 0xd8, 0x20, 0x53, 0xed, 0x52, 0x55, 0x45, 0x26, 0xa4, 0x82, 0x1e, 0x58, 0xf9, 0xc6, 0xe9, 0x89, - 0x73, 0xb1, 0x6c, 0xd2, 0xb4, 0xc1, 0xf7, 0x01, 0xe9, 0x09, 0x8f, 0xfb, 0xed, 0xc4, 0xc8, 0xce, - 0x25, 0x46, 0x36, 0x7a, 0x04, 0x55, 0x7f, 0x23, 0x1a, 0xae, 0x28, 0xc3, 0x25, 0xbd, 0x22, 0xf7, - 0x18, 0xa5, 0xa1, 0x27, 0x90, 0x27, 0x63, 0x62, 0x79, 0x6e, 0xa3, 0xcc, 0x12, 0x72, 0x55, 0x1e, - 0x8d, 0xdb, 0x94, 0xaa, 0x8b, 0x4e, 0xfc, 0x5b, 0x70, 0x83, 0x5d, 0x41, 0xde, 0x3a, 0x86, 0xa5, - 0xde, 0x95, 0x3a, 0x9d, 0x1d, 0xe1, 0x3a, 0xfa, 0x89, 0x6a, 0x90, 0xd9, 0xda, 0x10, 0x13, 0xcd, - 0x6c, 0x6d, 0xe0, 0x9f, 0x6b, 0x80, 0xd4, 0x71, 0x53, 0xf9, 0x32, 0x22, 0x5c, 0xaa, 0xcf, 0x06, - 0xea, 0x17, 0x20, 0x47, 0x1c, 0xc7, 0x76, 0x98, 0xd7, 0x4a, 0x3a, 0x6f, 0xe0, 0xc7, 0xc2, 0x06, - 0x9d, 0x8c, 0xed, 0x73, 0x3f, 0x66, 0xb8, 0x34, 0xcd, 0x37, 0x75, 0x1b, 0xe6, 0x43, 0x5c, 0x53, - 0x15, 0x86, 0x67, 0x70, 0x93, 0x09, 0xdb, 0x26, 0x64, 0xb8, 0xd6, 0x37, 0xc7, 0xa9, 0x5a, 0x87, - 0x70, 0x2b, 0xca, 0xf8, 0xcd, 0xfa, 0x08, 0xff, 0xae, 0xd0, 0xd8, 0x31, 0x07, 0xa4, 0x63, 0xef, - 0xa4, 0xdb, 0x46, 0x13, 0xe7, 0x39, 0xb9, 0x74, 0x45, 0x05, 0x65, 0xdf, 0xf8, 0x9f, 0x34, 0xb8, - 0x1d, 0x1b, 0xfe, 0x0d, 0xaf, 0xea, 0x22, 0xc0, 0x29, 0xdd, 0x3e, 0xa4, 0x47, 0x3b, 0xf8, 0xe5, - 0x5d, 0xa1, 0xf8, 0x76, 0xd2, 0xdc, 0x53, 0x11, 0x76, 0x2e, 0x88, 0x35, 0x67, 0x7f, 0x5c, 0x59, - 0x7e, 0xee, 0x43, 0x99, 0x11, 0x0e, 0x3c, 0xc3, 0x1b, 0xb9, 0xb1, 0xc5, 0xf8, 0x13, 0xb1, 0x05, - 0xe4, 0xa0, 0xa9, 0xe6, 0xf5, 0x5d, 0xc8, 0xb3, 0x73, 0xab, 0x3c, 0xb5, 0x45, 0x2e, 0x0a, 0x8a, - 0x1d, 0xba, 0x60, 0xc4, 0x67, 0x90, 0x7f, 0xc7, 0xc0, 0x3e, 0xc5, 0xb2, 0x59, 0xb9, 0x14, 0x96, - 0x31, 0xe0, 0x10, 0x44, 0x49, 0x67, 0xdf, 0xec, 0x90, 0x43, 0x88, 0x73, 0xa8, 0xef, 0xf0, 0xc3, - 0x54, 0x49, 0xf7, 0xdb, 0xd4, 0x65, 0xdd, 0xbe, 0x49, 0x2c, 0x8f, 0xf5, 0xce, 0xb2, 0x5e, 0x85, - 0x82, 0x57, 0xa0, 0xce, 0x35, 0xad, 0xf5, 0x7a, 0xca, 0x61, 0xc5, 0x97, 0xa7, 0x85, 0xe5, 0xe1, - 0x5f, 0x69, 0x70, 0x43, 0x19, 0x30, 0x95, 0x63, 0x5e, 0x41, 0x9e, 0x43, 0x9a, 0xa2, 0x2e, 0x2e, - 0x84, 0x47, 0x71, 0x35, 0xba, 0xe0, 0x41, 0x2b, 0x50, 0xe0, 0x5f, 0xf2, 0xc4, 0x98, 0xcc, 0x2e, - 0x99, 0xf0, 0x13, 0x98, 0x17, 0x24, 0x32, 0xb0, 0x93, 0xf6, 0x36, 0x73, 0x28, 0xfe, 0x19, 0x2c, - 0x84, 0xd9, 0xa6, 0x9a, 0x92, 0x62, 0x64, 0xe6, 0x3a, 0x46, 0xae, 0x49, 0x23, 0x0f, 0x87, 0x3d, - 0xa5, 0x8c, 0x47, 0x57, 0x5d, 0x5d, 0x91, 0x4c, 0x64, 0x45, 0xfc, 0x09, 0x48, 0x11, 0xdf, 0xea, - 0x04, 0xe6, 0xe5, 0x76, 0xd8, 0x31, 0x5d, 0xff, 0x70, 0xf7, 0x11, 0x90, 0x4a, 0xfc, 0xb6, 0x0d, - 0xda, 0x20, 0x27, 0x8e, 0x71, 0x3a, 0x20, 0x7e, 0x7d, 0xa2, 0x47, 0x7d, 0x95, 0x38, 0x55, 0x46, - 0x6f, 0xc1, 0x8d, 0x77, 0xf6, 0x98, 0xa6, 0x06, 0x4a, 0x0d, 0x42, 0x86, 0x5f, 0xf5, 0xfc, 0x65, - 0xf3, 0xdb, 0x54, 0xb9, 0x3a, 0x60, 0x2a, 0xe5, 0xff, 0xaa, 0x41, 0x65, 0xad, 0x6f, 0x38, 0x03, - 0xa9, 0xf8, 0x07, 0x90, 0xe7, 0x17, 0x18, 0x81, 0x19, 0x3c, 0x0d, 0x8b, 0x51, 0x79, 0x79, 0x63, - 0x8d, 0x5f, 0x77, 0xc4, 0x28, 0x6a, 0xb8, 0x78, 0x56, 0xd8, 0x88, 0x3c, 0x33, 0x6c, 0xa0, 0x4f, - 0x20, 0x67, 0xd0, 0x21, 0x2c, 0x05, 0xd7, 0xa2, 0x57, 0x47, 0x26, 0x8d, 0x9d, 0xdb, 0x38, 0x17, - 0xfe, 0x3e, 0x94, 0x15, 0x0d, 0xf4, 0x72, 0xfc, 0xb6, 0x2d, 0x0e, 0x60, 0x6b, 0xeb, 0x9d, 0xad, - 0xf7, 0xfc, 0xce, 0x5c, 0x03, 0xd8, 0x68, 0xfb, 0xed, 0x0c, 0xfe, 0x4c, 0x8c, 0x12, 0xf9, 0x4e, - 0xb5, 0x47, 0x4b, 0xb3, 0x27, 0x73, 0x2d, 0x7b, 0x2e, 0xa0, 0x2a, 0xa6, 0x3f, 0x6d, 0xfa, 0x66, - 0xf2, 0x52, 0xd2, 0xb7, 0x62, 0xbc, 0x2e, 0x18, 0xf1, 0x1c, 0x54, 0x45, 0x42, 0x17, 0xfb, 0xef, - 0xaf, 0x33, 0x50, 0x93, 0x94, 0x69, 0xb1, 0x4d, 0x09, 0xcb, 0xf0, 0x0a, 0xe0, 0x83, 0x32, 0xb7, - 0x20, 0xdf, 0x3b, 0x3e, 0x30, 0x3f, 0x4a, 0x1c, 0x5a, 0xb4, 0x28, 0xbd, 0xcf, 0xf5, 0xf0, 0xc7, - 0x20, 0xd1, 0xa2, 0x17, 0x74, 0xc7, 0x38, 0xf1, 0xb6, 0xac, 0x1e, 0xb9, 0x60, 0xe7, 0xc6, 0x59, - 0x3d, 0x20, 0xb0, 0xfb, 0xaa, 0x78, 0x34, 0x62, 0x87, 0x45, 0xe5, 0x11, 0x09, 0xbd, 0x80, 0x3a, - 0xfd, 0x5e, 0x1b, 0x0e, 0xfb, 0x26, 0xe9, 0x71, 0x01, 0x05, 0xc6, 0x13, 0xa3, 0x53, 0xed, 0xec, - 0xe8, 0xe5, 0x36, 0x8a, 0x2c, 0x6d, 0x89, 0x16, 0x8d, 0xd2, 0xb5, 0x91, 0x77, 0xd6, 0xb6, 0x8c, - 0xe3, 0xbe, 0xcc, 0x7a, 0xb4, 0x54, 0x53, 0xe2, 0x86, 0xe9, 0xaa, 0xd4, 0x36, 0xcc, 0x53, 0x2a, - 0xb1, 0x3c, 0xb3, 0xab, 0xa4, 0x48, 0x59, 0x08, 0xb5, 0x48, 0x21, 0x34, 0x5c, 0xf7, 0x83, 0xed, - 0xf4, 0x84, 0x7b, 0xfc, 0x36, 0xde, 0xe0, 0xc2, 0x0f, 0xdd, 0x50, 0xa9, 0xfb, 0xb2, 0x52, 0x96, - 0x03, 0x29, 0x6f, 0x89, 0x37, 0x41, 0x0a, 0x7e, 0x09, 0x37, 0x25, 0xa7, 0xc0, 0x0e, 0x27, 0x30, - 0xef, 0xc1, 0x7d, 0xc9, 0xbc, 0x7e, 0x46, 0x2f, 0x67, 0xfb, 0x42, 0xe1, 0x57, 0xb5, 0xf3, 0x0d, - 0x34, 0x7c, 0x3b, 0xd9, 0x81, 0xdb, 0xee, 0xab, 0x06, 0x8c, 0x5c, 0xb1, 0xef, 0x4a, 0x3a, 0xfb, - 0xa6, 0x34, 0xc7, 0xee, 0xfb, 0xc7, 0x0a, 0xfa, 0x8d, 0xd7, 0xe1, 0x8e, 0x94, 0x21, 0x8e, 0xc2, - 0x61, 0x21, 0x31, 0x83, 0x92, 0x84, 0x08, 0x87, 0xd1, 0xa1, 0x93, 0xdd, 0xae, 0x72, 0x86, 0x5d, - 0xcb, 0x64, 0x6a, 0x8a, 0xcc, 0x9b, 0x7c, 0x47, 0x50, 0xc3, 0xd4, 0xaa, 0x23, 0xc8, 0x54, 0x80, - 0x4a, 0x16, 0x0b, 0x41, 0xc9, 0xb1, 0x85, 0x88, 0x89, 0xfe, 0x29, 0x2c, 0xfa, 0x46, 0x50, 0xbf, - 0xed, 0x13, 0x67, 0x60, 0xba, 0xae, 0x82, 0x36, 0x25, 0x4d, 0xfc, 0x29, 0xcc, 0x0e, 0x89, 0xc8, - 0x4b, 0xe5, 0x55, 0xb4, 0xc2, 0x9f, 0x87, 0x57, 0x94, 0xc1, 0xac, 0x1f, 0xf7, 0xe0, 0x81, 0x94, - 0xce, 0x3d, 0x9a, 0x28, 0x3e, 0x6a, 0x94, 0xbc, 0xd4, 0x73, 0xb7, 0xc6, 0x2f, 0xf5, 0x59, 0xbe, - 0xf6, 0x3e, 0x02, 0xfa, 0x63, 0xee, 0x48, 0x19, 0x5b, 0x53, 0xd5, 0x9b, 0x6d, 0xee, 0x53, 0x3f, - 0x24, 0xa7, 0x12, 0x76, 0x0c, 0x0b, 0xe1, 0x48, 0x9e, 0x2a, 0x15, 0x2e, 0x40, 0xce, 0xb3, 0xcf, - 0x89, 0x4c, 0x84, 0xbc, 0x21, 0x0d, 0xf6, 0xc3, 0x7c, 0x2a, 0x83, 0x8d, 0x40, 0x18, 0xdb, 0x92, - 0xd3, 0xda, 0x4b, 0x57, 0x53, 0x1e, 0xe0, 0x78, 0x03, 0xef, 0xc2, 0xad, 0x68, 0x9a, 0x98, 0xca, - 0xe4, 0xf7, 0x7c, 0x03, 0x27, 0x65, 0x92, 0xa9, 0xe4, 0xfe, 0x24, 0x48, 0x06, 0x4a, 0x42, 0x99, - 0x4a, 0xa4, 0x0e, 0xcd, 0xa4, 0xfc, 0xf2, 0x75, 0xec, 0x57, 0x3f, 0xdd, 0x4c, 0x25, 0xcc, 0x0d, - 0x84, 0x4d, 0xbf, 0xfc, 0x41, 0x8e, 0xc8, 0x4e, 0xcc, 0x11, 0x22, 0x48, 0x82, 0x2c, 0xf6, 0x0d, - 0x6c, 0x3a, 0xa1, 0x23, 0x48, 0xa0, 0xd3, 0xea, 0xa0, 0x35, 0xc4, 0xd7, 0xc1, 0x1a, 0x72, 0x63, - 0xab, 0x69, 0x77, 0xaa, 0xc5, 0xf8, 0x34, 0xc8, 0x9d, 0xb1, 0xcc, 0x3c, 0x95, 0xe0, 0xcf, 0x60, - 0x29, 0x3d, 0x29, 0x4f, 0x23, 0xf9, 0x45, 0x0b, 0x4a, 0xfe, 0xa1, 0x54, 0xf9, 0x69, 0x45, 0x19, - 0x0a, 0xbb, 0x7b, 0x07, 0xfb, 0x6b, 0xeb, 0x6d, 0xfe, 0xdb, 0x8a, 0xf5, 0x3d, 0x5d, 0x3f, 0xdc, - 0xef, 0xd4, 0x33, 0xab, 0xff, 0x9b, 0x85, 0xcc, 0xf6, 0x7b, 0xf4, 0xfb, 0x90, 0xe3, 0x0f, 0x8d, - 0x13, 0x5e, 0x97, 0x9b, 0x93, 0xde, 0x52, 0xf1, 0xdd, 0x9f, 0xff, 0xfb, 0x7f, 0xfd, 0x32, 0x73, - 0x13, 0xd7, 0x5b, 0xe3, 0xef, 0x1d, 0x13, 0xcf, 0x68, 0x9d, 0x8f, 0x5b, 0xac, 0x3e, 0xbc, 0xd6, - 0x5e, 0xa0, 0x43, 0xc8, 0xee, 0x8f, 0x3c, 0x94, 0xfa, 0xf2, 0xdc, 0x4c, 0x7f, 0x62, 0xc5, 0x77, - 0x98, 0xe0, 0x79, 0x5c, 0x53, 0x04, 0x0f, 0x47, 0x1e, 0x15, 0x3b, 0x82, 0xb2, 0xfa, 0x48, 0x7a, - 0xe5, 0x93, 0x74, 0xf3, 0xea, 0x07, 0x58, 0xfc, 0x90, 0xa9, 0xbb, 0x8b, 0x6f, 0x29, 0xea, 0xf8, - 0x53, 0xae, 0x3a, 0x9b, 0xce, 0x85, 0x85, 0x52, 0x1f, 0xad, 0x9b, 0xe9, 0xef, 0xb2, 0x89, 0xb3, - 0xf1, 0x2e, 0x2c, 0x2a, 0xd6, 0x12, 0xcf, 0xb2, 0x5d, 0x0f, 0x3d, 0x48, 0x78, 0x96, 0x53, 0x1f, - 0xa0, 0x9a, 0x4b, 0xe9, 0x0c, 0x42, 0xd1, 0x12, 0x53, 0xd4, 0xc4, 0x37, 0x15, 0x45, 0x5d, 0x9f, - 0xed, 0xb5, 0xf6, 0x62, 0xf5, 0x14, 0x72, 0x0c, 0x65, 0x46, 0x7f, 0x20, 0x3f, 0x9a, 0x09, 0xd0, - 0x79, 0xca, 0xe2, 0x87, 0xf0, 0x69, 0xdc, 0x60, 0xca, 0x10, 0xae, 0x4a, 0x65, 0x0c, 0x67, 0x7e, - 0xad, 0xbd, 0x58, 0xd6, 0xbe, 0xa3, 0xad, 0xfe, 0xcf, 0x2c, 0xe4, 0x18, 0xe4, 0x84, 0x6c, 0x80, - 0x00, 0x91, 0x8d, 0xce, 0x32, 0x86, 0xf1, 0x46, 0x67, 0x19, 0x07, 0x73, 0xf1, 0x22, 0x53, 0xdc, - 0xc0, 0xf3, 0x52, 0x31, 0x43, 0xb3, 0x5a, 0x0c, 0xa0, 0xa3, 0x3e, 0x1d, 0x0b, 0xd0, 0x8d, 0x87, - 0x19, 0x4a, 0x12, 0x18, 0x42, 0x66, 0xa3, 0x3b, 0x24, 0x01, 0x95, 0xc5, 0x98, 0xe9, 0xbc, 0x87, - 0x6f, 0x2b, 0x9e, 0xe5, 0x6a, 0x1d, 0xc6, 0x48, 0xf5, 0xfe, 0x99, 0x06, 0xb5, 0x30, 0xb6, 0x8a, - 0x1e, 0x25, 0x48, 0x8e, 0x42, 0xb4, 0xcd, 0xc7, 0x93, 0x99, 0xd2, 0x2c, 0xe0, 0xea, 0xcf, 0x09, - 0x19, 0x1a, 0x94, 0x51, 0x38, 0x1e, 0xfd, 0x85, 0x06, 0x73, 0x11, 0xc0, 0x14, 0x25, 0x69, 0x88, - 0xc1, 0xb1, 0xcd, 0x27, 0x57, 0x70, 0x09, 0x43, 0x9e, 0x32, 0x43, 0x96, 0xf0, 0xdd, 0x98, 0x2b, - 0x3c, 0x73, 0x40, 0x3c, 0x5b, 0x18, 0xe3, 0x2f, 0x03, 0x07, 0x37, 0x13, 0x97, 0x21, 0x04, 0x96, - 0x26, 0x2e, 0x43, 0x18, 0x19, 0x9d, 0xb0, 0x0c, 0x1c, 0xd1, 0xa4, 0x5b, 0xfc, 0xff, 0xb2, 0x50, - 0x58, 0xe7, 0x3f, 0x70, 0x44, 0x2e, 0x94, 0x7c, 0x14, 0x11, 0x2d, 0x26, 0x21, 0x3a, 0xc1, 0x6d, - 0xa1, 0xf9, 0x20, 0xb5, 0x5f, 0x68, 0x7f, 0xc2, 0xb4, 0x3f, 0xc0, 0x4d, 0xa9, 0x5d, 0xfc, 0x8e, - 0xb2, 0xc5, 0xa1, 0x83, 0x96, 0xd1, 0xeb, 0xd1, 0x89, 0xff, 0x29, 0x54, 0x54, 0xa8, 0x0f, 0x3d, + 0x79, 0x5a, 0xd4, 0xad, 0xbb, 0xfa, 0x46, 0x69, 0x86, 0x33, 0xf3, 0x22, 0x77, 0x9d, 0x3e, 0x75, + 0xce, 0xa9, 0x53, 0x75, 0x2e, 0xf5, 0x35, 0x0d, 0x25, 0x67, 0xd8, 0x5d, 0x19, 0x3a, 0xb6, 0x67, + 0xa3, 0x0a, 0xf1, 0xba, 0x3d, 0x97, 0x38, 0x63, 0xe2, 0x0c, 0x8f, 0x9b, 0x0b, 0xa7, 0xf6, 0xa9, + 0xcd, 0x5e, 0xb4, 0xe8, 0x13, 0xe7, 0x69, 0x62, 0xca, 0xd3, 0x32, 0x2d, 0x8f, 0x38, 0x96, 0xd1, + 0x6f, 0x0d, 0xc6, 0xdd, 0x2e, 0xfb, 0x33, 0x3c, 0x6e, 0x9d, 0x8f, 0x05, 0xcf, 0xe3, 0x30, 0x8f, + 0x31, 0xf2, 0xce, 0xd8, 0x9f, 0xe1, 0x31, 0xfb, 0x47, 0x70, 0xdd, 0x3b, 0xb5, 0xed, 0xd3, 0x3e, + 0x69, 0x19, 0x43, 0xb3, 0x65, 0x58, 0x96, 0xed, 0x19, 0x9e, 0x69, 0x5b, 0x2e, 0x7f, 0x8b, 0xff, + 0x5c, 0x83, 0x9a, 0x4e, 0xdc, 0xa1, 0x6d, 0xb9, 0x64, 0x93, 0x18, 0x3d, 0xe2, 0xa0, 0xfb, 0x00, + 0xdd, 0xfe, 0xc8, 0xf5, 0x88, 0x73, 0x64, 0xf6, 0x1a, 0xda, 0x92, 0xb6, 0x3c, 0xab, 0x97, 0x04, + 0x65, 0xab, 0x87, 0xee, 0x42, 0x69, 0x40, 0x06, 0xc7, 0xfc, 0x6d, 0x86, 0xbd, 0x2d, 0x72, 0xc2, + 0x56, 0x0f, 0x35, 0xa1, 0xe8, 0x90, 0xb1, 0xe9, 0x9a, 0xb6, 0xd5, 0xc8, 0x2e, 0x69, 0xcb, 0x59, + 0xdd, 0x1f, 0xd3, 0x89, 0x8e, 0x71, 0xe2, 0x1d, 0x79, 0xc4, 0x19, 0x34, 0x66, 0xf9, 0x44, 0x4a, + 0xe8, 0x10, 0x67, 0x80, 0x7f, 0x91, 0x83, 0x8a, 0x6e, 0x58, 0xa7, 0x44, 0x27, 0x7f, 0x34, 0x22, + 0xae, 0x87, 0xea, 0x90, 0x3d, 0x27, 0x97, 0x4c, 0x7d, 0x45, 0xa7, 0x8f, 0x7c, 0xbe, 0x75, 0x4a, + 0x8e, 0x88, 0xc5, 0x15, 0x57, 0xe8, 0x7c, 0xeb, 0x94, 0xb4, 0xad, 0x1e, 0x5a, 0x80, 0x5c, 0xdf, + 0x1c, 0x98, 0x9e, 0xd0, 0xca, 0x07, 0x21, 0x73, 0x66, 0x23, 0xe6, 0xac, 0x03, 0xb8, 0xb6, 0xe3, + 0x1d, 0xd9, 0x4e, 0x8f, 0x38, 0x8d, 0xdc, 0x92, 0xb6, 0x5c, 0x5b, 0x7d, 0xbc, 0xa2, 0x6e, 0xcd, + 0x8a, 0x6a, 0xd0, 0xca, 0x81, 0xed, 0x78, 0x7b, 0x94, 0x57, 0x2f, 0xb9, 0xf2, 0x11, 0xfd, 0x08, + 0xca, 0x4c, 0x88, 0x67, 0x38, 0xa7, 0xc4, 0x6b, 0xe4, 0x99, 0x94, 0x27, 0x57, 0x48, 0xe9, 0x30, + 0x66, 0x9d, 0xa9, 0xe7, 0xcf, 0x08, 0x43, 0xc5, 0x25, 0x8e, 0x69, 0xf4, 0xcd, 0x8f, 0xc6, 0x71, + 0x9f, 0x34, 0x0a, 0x4b, 0xda, 0x72, 0x51, 0x0f, 0xd1, 0xe8, 0xfa, 0xcf, 0xc9, 0xa5, 0x7b, 0x64, + 0x5b, 0xfd, 0xcb, 0x46, 0x91, 0x31, 0x14, 0x29, 0x61, 0xcf, 0xea, 0x5f, 0xb2, 0x4d, 0xb3, 0x47, + 0x96, 0xc7, 0xdf, 0x96, 0xd8, 0xdb, 0x12, 0xa3, 0xb0, 0xd7, 0xcb, 0x50, 0x1f, 0x98, 0xd6, 0xd1, + 0xc0, 0xee, 0x1d, 0xf9, 0x0e, 0x01, 0xe6, 0x90, 0xda, 0xc0, 0xb4, 0xde, 0xd9, 0x3d, 0x5d, 0xba, + 0x85, 0x72, 0x1a, 0x17, 0x61, 0xce, 0xb2, 0xe0, 0x34, 0x2e, 0x54, 0xce, 0x15, 0x98, 0xa7, 0x32, + 0xbb, 0x0e, 0x31, 0x3c, 0x12, 0x30, 0x57, 0x18, 0xf3, 0x8d, 0x81, 0x69, 0xad, 0xb3, 0x37, 0x21, + 0x7e, 0xe3, 0x22, 0xc6, 0x5f, 0x15, 0xfc, 0xc6, 0x45, 0x98, 0x1f, 0xaf, 0x40, 0xc9, 0xf7, 0x39, + 0x2a, 0xc2, 0xec, 0xee, 0xde, 0x6e, 0xbb, 0x3e, 0x83, 0x00, 0xf2, 0x6b, 0x07, 0xeb, 0xed, 0xdd, + 0x8d, 0xba, 0x86, 0xca, 0x50, 0xd8, 0x68, 0xf3, 0x41, 0x06, 0xbf, 0x01, 0x08, 0xbc, 0x8b, 0x0a, + 0x90, 0xdd, 0x6e, 0xff, 0x5e, 0x7d, 0x86, 0xf2, 0xbc, 0x6f, 0xeb, 0x07, 0x5b, 0x7b, 0xbb, 0x75, + 0x8d, 0x4e, 0x5e, 0xd7, 0xdb, 0x6b, 0x9d, 0x76, 0x3d, 0x43, 0x39, 0xde, 0xed, 0x6d, 0xd4, 0xb3, + 0xa8, 0x04, 0xb9, 0xf7, 0x6b, 0x3b, 0x87, 0xed, 0xfa, 0x2c, 0xfe, 0xa5, 0x06, 0x55, 0xb1, 0x5f, + 0x3c, 0x26, 0xd0, 0xf7, 0x21, 0x7f, 0xc6, 0xe2, 0x82, 0x1d, 0xc5, 0xf2, 0xea, 0xbd, 0xc8, 0xe6, + 0x86, 0x62, 0x47, 0x17, 0xbc, 0x08, 0x43, 0xf6, 0x7c, 0xec, 0x36, 0x32, 0x4b, 0xd9, 0xe5, 0xf2, + 0x6a, 0x7d, 0x85, 0x47, 0xee, 0xca, 0x36, 0xb9, 0x7c, 0x6f, 0xf4, 0x47, 0x44, 0xa7, 0x2f, 0x11, + 0x82, 0xd9, 0x81, 0xed, 0x10, 0x76, 0x62, 0x8b, 0x3a, 0x7b, 0xa6, 0xc7, 0x98, 0x6d, 0x9a, 0x38, + 0xad, 0x7c, 0x80, 0x7f, 0xad, 0x01, 0xec, 0x8f, 0xbc, 0xf4, 0xd0, 0x58, 0x80, 0xdc, 0x98, 0x0a, + 0x16, 0x61, 0xc1, 0x07, 0x2c, 0x26, 0x88, 0xe1, 0x12, 0x3f, 0x26, 0xe8, 0x00, 0xdd, 0x86, 0xc2, + 0xd0, 0x21, 0xe3, 0xa3, 0xf3, 0x31, 0x53, 0x52, 0xd4, 0xf3, 0x74, 0xb8, 0x3d, 0x46, 0x0f, 0xa1, + 0x62, 0x9e, 0x5a, 0xb6, 0x43, 0x8e, 0xb8, 0xac, 0x1c, 0x7b, 0x5b, 0xe6, 0x34, 0x66, 0xb7, 0xc2, + 0xc2, 0x05, 0xe7, 0x55, 0x96, 0x1d, 0x4a, 0xc2, 0x16, 0x94, 0x99, 0xa9, 0x53, 0xb9, 0xef, 0x79, + 0x60, 0x63, 0x86, 0x4d, 0x8b, 0xbb, 0x50, 0x58, 0x8d, 0x7f, 0x0a, 0x68, 0x83, 0xf4, 0x89, 0x47, + 0xa6, 0xc9, 0x1e, 0x8a, 0x4f, 0xb2, 0xaa, 0x4f, 0xf0, 0xdf, 0x68, 0x30, 0x1f, 0x12, 0x3f, 0xd5, + 0xb2, 0x1a, 0x50, 0xe8, 0x31, 0x61, 0xdc, 0x82, 0xac, 0x2e, 0x87, 0xe8, 0x25, 0x14, 0x85, 0x01, + 0x6e, 0x23, 0x9b, 0x72, 0x68, 0x0a, 0xdc, 0x26, 0x17, 0xff, 0x3a, 0x03, 0x25, 0xb1, 0xd0, 0xbd, + 0x21, 0x5a, 0x83, 0xaa, 0xc3, 0x07, 0x47, 0x6c, 0x3d, 0xc2, 0xa2, 0x66, 0x7a, 0x12, 0xda, 0x9c, + 0xd1, 0x2b, 0x62, 0x0a, 0x23, 0xa3, 0xdf, 0x81, 0xb2, 0x14, 0x31, 0x1c, 0x79, 0xc2, 0xe5, 0x8d, + 0xb0, 0x80, 0xe0, 0xfc, 0x6d, 0xce, 0xe8, 0x20, 0xd8, 0xf7, 0x47, 0x1e, 0xea, 0xc0, 0x82, 0x9c, + 0xcc, 0x57, 0x23, 0xcc, 0xc8, 0x32, 0x29, 0x4b, 0x61, 0x29, 0xf1, 0xad, 0xda, 0x9c, 0xd1, 0x91, + 0x98, 0xaf, 0xbc, 0x54, 0x4d, 0xf2, 0x2e, 0x78, 0xf2, 0x8e, 0x99, 0xd4, 0xb9, 0xb0, 0xe2, 0x26, + 0x75, 0x2e, 0xac, 0x37, 0x25, 0x28, 0x88, 0x11, 0xfe, 0xe7, 0x0c, 0x80, 0xdc, 0x8d, 0xbd, 0x21, + 0xda, 0x80, 0x9a, 0x23, 0x46, 0x21, 0x6f, 0xdd, 0x4d, 0xf4, 0x96, 0xd8, 0xc4, 0x19, 0xbd, 0x2a, + 0x27, 0x71, 0xe3, 0x7e, 0x00, 0x15, 0x5f, 0x4a, 0xe0, 0xb0, 0x3b, 0x09, 0x0e, 0xf3, 0x25, 0x94, + 0xe5, 0x04, 0xea, 0xb2, 0x4f, 0xe1, 0xa6, 0x3f, 0x3f, 0xc1, 0x67, 0x0f, 0x27, 0xf8, 0xcc, 0x17, + 0x38, 0x2f, 0x25, 0xa8, 0x5e, 0x53, 0x0d, 0x0b, 0xdc, 0x76, 0x27, 0xc1, 0x6d, 0x71, 0xc3, 0xa8, + 0xe3, 0x80, 0xd6, 0x4b, 0x3e, 0xc4, 0xff, 0x9d, 0x85, 0xc2, 0xba, 0x3d, 0x18, 0x1a, 0x0e, 0xdd, + 0x8d, 0xbc, 0x43, 0xdc, 0x51, 0xdf, 0x63, 0xee, 0xaa, 0xad, 0x3e, 0x0a, 0x4b, 0x14, 0x6c, 0xf2, + 0x5f, 0x9d, 0xb1, 0xea, 0x62, 0x0a, 0x9d, 0x2c, 0xca, 0x63, 0xe6, 0x1a, 0x93, 0x45, 0x71, 0x14, + 0x53, 0x64, 0x20, 0x67, 0x83, 0x40, 0x6e, 0x42, 0x61, 0x4c, 0x9c, 0xa0, 0xa4, 0x6f, 0xce, 0xe8, + 0x92, 0x80, 0x9e, 0xc3, 0x5c, 0xb4, 0xbc, 0xe4, 0x04, 0x4f, 0xad, 0x1b, 0xae, 0x46, 0x8f, 0xa0, + 0x12, 0xaa, 0x71, 0x79, 0xc1, 0x57, 0x1e, 0x28, 0x25, 0xee, 0x96, 0xcc, 0xab, 0xb4, 0x1e, 0x57, + 0x36, 0x67, 0x64, 0x66, 0xbd, 0x25, 0x33, 0x6b, 0x51, 0xcc, 0x12, 0xb9, 0x35, 0x94, 0x64, 0x7e, + 0x18, 0x4e, 0x32, 0xf8, 0x87, 0x50, 0x0d, 0x39, 0x88, 0xd6, 0x9d, 0xf6, 0x4f, 0x0e, 0xd7, 0x76, + 0x78, 0x91, 0x7a, 0xcb, 0xea, 0x92, 0x5e, 0xd7, 0x68, 0xad, 0xdb, 0x69, 0x1f, 0x1c, 0xd4, 0x33, + 0xa8, 0x0a, 0xa5, 0xdd, 0xbd, 0xce, 0x11, 0xe7, 0xca, 0xe2, 0xb7, 0xbe, 0x04, 0x51, 0xe4, 0x94, + 0xda, 0x36, 0xa3, 0xd4, 0x36, 0x4d, 0xd6, 0xb6, 0x4c, 0x50, 0xdb, 0x58, 0x99, 0xdb, 0x69, 0xaf, + 0x1d, 0xb4, 0xeb, 0xb3, 0x6f, 0x6a, 0x50, 0xe1, 0xfe, 0x3d, 0x1a, 0x59, 0xb4, 0xd4, 0xfe, 0xa3, + 0x06, 0x10, 0x44, 0x13, 0x6a, 0x41, 0xa1, 0xcb, 0xf5, 0x34, 0x34, 0x96, 0x8c, 0x6e, 0x26, 0x6e, + 0x99, 0x2e, 0xb9, 0xd0, 0x77, 0xa1, 0xe0, 0x8e, 0xba, 0x5d, 0xe2, 0xca, 0x92, 0x77, 0x3b, 0x9a, + 0x0f, 0x45, 0xb6, 0xd2, 0x25, 0x1f, 0x9d, 0x72, 0x62, 0x98, 0xfd, 0x11, 0x2b, 0x80, 0x93, 0xa7, + 0x08, 0x3e, 0xfc, 0xf7, 0x1a, 0x94, 0x95, 0xc3, 0xfb, 0x15, 0x93, 0xf0, 0x3d, 0x28, 0x31, 0x1b, + 0x48, 0x4f, 0xa4, 0xe1, 0xa2, 0x1e, 0x10, 0xd0, 0x6f, 0x43, 0x49, 0x46, 0x80, 0xcc, 0xc4, 0x8d, + 0x64, 0xb1, 0x7b, 0x43, 0x3d, 0x60, 0xc5, 0xdb, 0x70, 0x83, 0x79, 0xa5, 0x4b, 0x9b, 0x6b, 0xe9, + 0x47, 0xb5, 0xfd, 0xd4, 0x22, 0xed, 0x67, 0x13, 0x8a, 0xc3, 0xb3, 0x4b, 0xd7, 0xec, 0x1a, 0x7d, + 0x61, 0x85, 0x3f, 0xc6, 0x3f, 0x06, 0xa4, 0x0a, 0x9b, 0x66, 0xb9, 0xb8, 0x0a, 0xe5, 0x4d, 0xc3, + 0x3d, 0x13, 0x26, 0xe1, 0x97, 0x50, 0xa5, 0xc3, 0xed, 0xf7, 0xd7, 0xb0, 0x91, 0x5d, 0x0e, 0x24, + 0xf7, 0x54, 0x3e, 0x47, 0x30, 0x7b, 0x66, 0xb8, 0x67, 0x6c, 0xa1, 0x55, 0x9d, 0x3d, 0xa3, 0xe7, + 0x50, 0xef, 0xf2, 0x45, 0x1e, 0x45, 0xae, 0x0c, 0x73, 0x82, 0xee, 0x77, 0x82, 0x9f, 0x41, 0x85, + 0xaf, 0xe1, 0xeb, 0x36, 0x02, 0xdf, 0x80, 0xb9, 0x03, 0xcb, 0x18, 0xba, 0x67, 0xb6, 0xac, 0x6e, + 0x74, 0xd1, 0xf5, 0x80, 0x36, 0x95, 0xc6, 0x67, 0x30, 0xe7, 0x90, 0x81, 0x61, 0x5a, 0xa6, 0x75, + 0x7a, 0x74, 0x7c, 0xe9, 0x11, 0x57, 0x5c, 0x98, 0x6a, 0x3e, 0xf9, 0x0d, 0xa5, 0x52, 0xd3, 0x8e, + 0xfb, 0xf6, 0xb1, 0x48, 0x73, 0xec, 0x19, 0x7f, 0xae, 0x41, 0xe5, 0x53, 0xc3, 0xeb, 0xca, 0xad, + 0x43, 0x5b, 0x50, 0xf3, 0x93, 0x1b, 0xa3, 0x08, 0x5b, 0x22, 0x25, 0x96, 0xcd, 0x91, 0xad, 0xb4, + 0xac, 0x8e, 0xd5, 0xae, 0x4a, 0x60, 0xa2, 0x0c, 0xab, 0x4b, 0xfa, 0xbe, 0xa8, 0x4c, 0xba, 0x28, + 0xc6, 0xa8, 0x8a, 0x52, 0x09, 0x6f, 0xe6, 0x82, 0xf6, 0x83, 0xe7, 0x92, 0xcf, 0x33, 0x80, 0xe2, + 0x36, 0x7c, 0xd9, 0x8e, 0xec, 0x09, 0xd4, 0x5c, 0xcf, 0x70, 0x62, 0x67, 0xa3, 0xca, 0xa8, 0x7e, + 0x82, 0x7e, 0x06, 0x73, 0x43, 0xc7, 0x3e, 0x75, 0x88, 0xeb, 0x1e, 0x59, 0xb6, 0x67, 0x9e, 0x5c, + 0x8a, 0xa6, 0xb6, 0x26, 0xc9, 0xbb, 0x8c, 0x8a, 0xda, 0x50, 0x38, 0x31, 0xfb, 0x1e, 0x71, 0xdc, + 0x46, 0x6e, 0x29, 0xbb, 0x5c, 0x5b, 0x7d, 0x79, 0x95, 0xd7, 0x56, 0x7e, 0xc4, 0xf8, 0x3b, 0x97, + 0x43, 0xa2, 0xcb, 0xb9, 0x6a, 0xa3, 0x98, 0x0f, 0x35, 0xcf, 0x77, 0xa0, 0xf8, 0x81, 0x8a, 0xa0, + 0x97, 0xe2, 0x02, 0xef, 0xed, 0xd8, 0x78, 0xab, 0x87, 0x9f, 0x00, 0x04, 0xa2, 0x68, 0x16, 0xde, + 0xdd, 0xdb, 0x3f, 0xec, 0xd4, 0x67, 0x50, 0x05, 0x8a, 0xbb, 0x7b, 0x1b, 0xed, 0x9d, 0x36, 0x4d, + 0xd9, 0xb8, 0x25, 0xdd, 0xa6, 0xba, 0x37, 0x24, 0x57, 0x0b, 0xcb, 0xfd, 0xab, 0x0c, 0x54, 0xc5, + 0x01, 0x99, 0xea, 0x94, 0xaa, 0x2a, 0x32, 0x21, 0x15, 0xb4, 0x61, 0xe5, 0x07, 0xa7, 0x27, 0xfa, + 0x62, 0x39, 0xa4, 0x69, 0x83, 0x9f, 0x03, 0xd2, 0x13, 0x1e, 0xf7, 0xc7, 0x89, 0x91, 0x9d, 0x4b, + 0x8c, 0x6c, 0xf4, 0x08, 0xaa, 0xfe, 0x41, 0x34, 0x5c, 0x51, 0x86, 0x4b, 0x7a, 0x45, 0x9e, 0x31, + 0x4a, 0x43, 0x4f, 0x20, 0x4f, 0xc6, 0xc4, 0xf2, 0xdc, 0x46, 0x99, 0x25, 0xe4, 0xaa, 0x6c, 0x8d, + 0xdb, 0x94, 0xaa, 0x8b, 0x97, 0xf8, 0xb7, 0xe0, 0x06, 0xbb, 0x82, 0xbc, 0x75, 0x0c, 0x4b, 0xbd, + 0x2b, 0x75, 0x3a, 0x3b, 0xc2, 0x75, 0xf4, 0x11, 0xd5, 0x20, 0xb3, 0xb5, 0x21, 0x16, 0x9a, 0xd9, + 0xda, 0xc0, 0x3f, 0xd7, 0x00, 0xa9, 0xf3, 0xa6, 0xf2, 0x65, 0x44, 0xb8, 0x54, 0x9f, 0x0d, 0xd4, + 0x2f, 0x40, 0x8e, 0x38, 0x8e, 0xed, 0x30, 0xaf, 0x95, 0x74, 0x3e, 0xc0, 0x8f, 0x85, 0x0d, 0x3a, + 0x19, 0xdb, 0xe7, 0x7e, 0xcc, 0x70, 0x69, 0x9a, 0x6f, 0xea, 0x36, 0xcc, 0x87, 0xb8, 0xa6, 0x2a, + 0x0c, 0xcf, 0xe0, 0x26, 0x13, 0xb6, 0x4d, 0xc8, 0x70, 0xad, 0x6f, 0x8e, 0x53, 0xb5, 0x0e, 0xe1, + 0x56, 0x94, 0xf1, 0x9b, 0xf5, 0x11, 0xfe, 0x5d, 0xa1, 0xb1, 0x63, 0x0e, 0x48, 0xc7, 0xde, 0x49, + 0xb7, 0x8d, 0x26, 0xce, 0x73, 0x72, 0xe9, 0x8a, 0x0a, 0xca, 0x9e, 0xf1, 0x3f, 0x69, 0x70, 0x3b, + 0x36, 0xfd, 0x1b, 0xde, 0xd5, 0x45, 0x80, 0x53, 0x7a, 0x7c, 0x48, 0x8f, 0xbe, 0xe0, 0x97, 0x77, + 0x85, 0xe2, 0xdb, 0x49, 0x73, 0x4f, 0x45, 0xd8, 0xb9, 0x20, 0xf6, 0x9c, 0xfd, 0x71, 0x65, 0xf9, + 0xb9, 0x0f, 0x65, 0x46, 0x38, 0xf0, 0x0c, 0x6f, 0xe4, 0xc6, 0x36, 0xe3, 0x4f, 0xc4, 0x11, 0x90, + 0x93, 0xa6, 0x5a, 0xd7, 0x77, 0x21, 0xcf, 0xfa, 0x56, 0xd9, 0xb5, 0x45, 0x2e, 0x0a, 0x8a, 0x1d, + 0xba, 0x60, 0xc4, 0x67, 0x90, 0x7f, 0xc7, 0xc0, 0x3e, 0xc5, 0xb2, 0x59, 0xb9, 0x15, 0x96, 0x31, + 0xe0, 0x10, 0x44, 0x49, 0x67, 0xcf, 0xac, 0xc9, 0x21, 0xc4, 0x39, 0xd4, 0x77, 0x78, 0x33, 0x55, + 0xd2, 0xfd, 0x31, 0x75, 0x59, 0xb7, 0x6f, 0x12, 0xcb, 0x63, 0x6f, 0x67, 0xd9, 0x5b, 0x85, 0x82, + 0x57, 0xa0, 0xce, 0x35, 0xad, 0xf5, 0x7a, 0x4a, 0xb3, 0xe2, 0xcb, 0xd3, 0xc2, 0xf2, 0xf0, 0xaf, + 0x34, 0xb8, 0xa1, 0x4c, 0x98, 0xca, 0x31, 0xaf, 0x20, 0xcf, 0x21, 0x4d, 0x51, 0x17, 0x17, 0xc2, + 0xb3, 0xb8, 0x1a, 0x5d, 0xf0, 0xa0, 0x15, 0x28, 0xf0, 0x27, 0xd9, 0x31, 0x26, 0xb3, 0x4b, 0x26, + 0xfc, 0x04, 0xe6, 0x05, 0x89, 0x0c, 0xec, 0xa4, 0xb3, 0xcd, 0x1c, 0x8a, 0x7f, 0x06, 0x0b, 0x61, + 0xb6, 0xa9, 0x96, 0xa4, 0x18, 0x99, 0xb9, 0x8e, 0x91, 0x6b, 0xd2, 0xc8, 0xc3, 0x61, 0x4f, 0x29, + 0xe3, 0xd1, 0x5d, 0x57, 0x77, 0x24, 0x13, 0xd9, 0x11, 0x7f, 0x01, 0x52, 0xc4, 0xb7, 0xba, 0x80, + 0x79, 0x79, 0x1c, 0x76, 0x4c, 0xd7, 0x6f, 0xee, 0x3e, 0x02, 0x52, 0x89, 0xdf, 0xb6, 0x41, 0x1b, + 0xe4, 0xc4, 0x31, 0x4e, 0x07, 0xc4, 0xaf, 0x4f, 0xb4, 0xd5, 0x57, 0x89, 0x53, 0x65, 0xf4, 0x16, + 0xdc, 0x78, 0x67, 0x8f, 0x69, 0x6a, 0xa0, 0xd4, 0x20, 0x64, 0xf8, 0x55, 0xcf, 0xdf, 0x36, 0x7f, + 0x4c, 0x95, 0xab, 0x13, 0xa6, 0x52, 0xfe, 0xaf, 0x1a, 0x54, 0xd6, 0xfa, 0x86, 0x33, 0x90, 0x8a, + 0x7f, 0x00, 0x79, 0x7e, 0x81, 0x11, 0x98, 0xc1, 0xd3, 0xb0, 0x18, 0x95, 0x97, 0x0f, 0xd6, 0xf8, + 0x75, 0x47, 0xcc, 0xa2, 0x86, 0x8b, 0xcf, 0x0a, 0x1b, 0x91, 0xcf, 0x0c, 0x1b, 0xe8, 0x13, 0xc8, + 0x19, 0x74, 0x0a, 0x4b, 0xc1, 0xb5, 0xe8, 0xd5, 0x91, 0x49, 0x63, 0x7d, 0x1b, 0xe7, 0xc2, 0xdf, + 0x87, 0xb2, 0xa2, 0x81, 0x5e, 0x8e, 0xdf, 0xb6, 0x45, 0x03, 0xb6, 0xb6, 0xde, 0xd9, 0x7a, 0xcf, + 0xef, 0xcc, 0x35, 0x80, 0x8d, 0xb6, 0x3f, 0xce, 0xe0, 0xcf, 0xc4, 0x2c, 0x91, 0xef, 0x54, 0x7b, + 0xb4, 0x34, 0x7b, 0x32, 0xd7, 0xb2, 0xe7, 0x02, 0xaa, 0x62, 0xf9, 0xd3, 0xa6, 0x6f, 0x26, 0x2f, + 0x25, 0x7d, 0x2b, 0xc6, 0xeb, 0x82, 0x11, 0xcf, 0x41, 0x55, 0x24, 0x74, 0x71, 0xfe, 0xfe, 0x3a, + 0x03, 0x35, 0x49, 0x99, 0x16, 0xdb, 0x94, 0xb0, 0x0c, 0xaf, 0x00, 0x3e, 0x28, 0x73, 0x0b, 0xf2, + 0xbd, 0xe3, 0x03, 0xf3, 0xa3, 0xc4, 0xa1, 0xc5, 0x88, 0xd2, 0xfb, 0x5c, 0x0f, 0xff, 0x18, 0x24, + 0x46, 0xf4, 0x82, 0xee, 0x18, 0x27, 0xde, 0x96, 0xd5, 0x23, 0x17, 0xac, 0x6f, 0x9c, 0xd5, 0x03, + 0x02, 0xbb, 0xaf, 0x8a, 0x8f, 0x46, 0xac, 0x59, 0x54, 0x3e, 0x22, 0xa1, 0x17, 0x50, 0xa7, 0xcf, + 0x6b, 0xc3, 0x61, 0xdf, 0x24, 0x3d, 0x2e, 0xa0, 0xc0, 0x78, 0x62, 0x74, 0xaa, 0x9d, 0xb5, 0x5e, + 0x6e, 0xa3, 0xc8, 0xd2, 0x96, 0x18, 0xd1, 0x28, 0x5d, 0x1b, 0x79, 0x67, 0x6d, 0xcb, 0x38, 0xee, + 0xcb, 0xac, 0x47, 0x4b, 0x35, 0x25, 0x6e, 0x98, 0xae, 0x4a, 0x6d, 0xc3, 0x3c, 0xa5, 0x12, 0xcb, + 0x33, 0xbb, 0x4a, 0x8a, 0x94, 0x85, 0x50, 0x8b, 0x14, 0x42, 0xc3, 0x75, 0x3f, 0xd8, 0x4e, 0x4f, + 0xb8, 0xc7, 0x1f, 0xe3, 0x0d, 0x2e, 0xfc, 0xd0, 0x0d, 0x95, 0xba, 0x2f, 0x2b, 0x65, 0x39, 0x90, + 0xf2, 0x96, 0x78, 0x13, 0xa4, 0xe0, 0x97, 0x70, 0x53, 0x72, 0x0a, 0xec, 0x70, 0x02, 0xf3, 0x1e, + 0xdc, 0x97, 0xcc, 0xeb, 0x67, 0xf4, 0x72, 0xb6, 0x2f, 0x14, 0x7e, 0x55, 0x3b, 0xdf, 0x40, 0xc3, + 0xb7, 0x93, 0x35, 0xdc, 0x76, 0x5f, 0x35, 0x60, 0xe4, 0x8a, 0x73, 0x57, 0xd2, 0xd9, 0x33, 0xa5, + 0x39, 0x76, 0xdf, 0x6f, 0x2b, 0xe8, 0x33, 0x5e, 0x87, 0x3b, 0x52, 0x86, 0x68, 0x85, 0xc3, 0x42, + 0x62, 0x06, 0x25, 0x09, 0x11, 0x0e, 0xa3, 0x53, 0x27, 0xbb, 0x5d, 0xe5, 0x0c, 0xbb, 0x96, 0xc9, + 0xd4, 0x14, 0x99, 0x37, 0xf9, 0x89, 0xa0, 0x86, 0xa9, 0x55, 0x47, 0x90, 0xa9, 0x00, 0x95, 0x2c, + 0x36, 0x82, 0x92, 0x63, 0x1b, 0x11, 0x13, 0xfd, 0x53, 0x58, 0xf4, 0x8d, 0xa0, 0x7e, 0xdb, 0x27, + 0xce, 0xc0, 0x74, 0x5d, 0x05, 0x6d, 0x4a, 0x5a, 0xf8, 0x53, 0x98, 0x1d, 0x12, 0x91, 0x97, 0xca, + 0xab, 0x68, 0x85, 0x7f, 0x1e, 0x5e, 0x51, 0x26, 0xb3, 0xf7, 0xb8, 0x07, 0x0f, 0xa4, 0x74, 0xee, + 0xd1, 0x44, 0xf1, 0x51, 0xa3, 0xe4, 0xa5, 0x9e, 0xbb, 0x35, 0x7e, 0xa9, 0xcf, 0xf2, 0xbd, 0xf7, + 0x11, 0xd0, 0x1f, 0x73, 0x47, 0xca, 0xd8, 0x9a, 0xaa, 0xde, 0x6c, 0x73, 0x9f, 0xfa, 0x21, 0x39, + 0x95, 0xb0, 0x63, 0x58, 0x08, 0x47, 0xf2, 0x54, 0xa9, 0x70, 0x01, 0x72, 0x9e, 0x7d, 0x4e, 0x64, + 0x22, 0xe4, 0x03, 0x69, 0xb0, 0x1f, 0xe6, 0x53, 0x19, 0x6c, 0x04, 0xc2, 0xd8, 0x91, 0x9c, 0xd6, + 0x5e, 0xba, 0x9b, 0xb2, 0x81, 0xe3, 0x03, 0xbc, 0x0b, 0xb7, 0xa2, 0x69, 0x62, 0x2a, 0x93, 0xdf, + 0xf3, 0x03, 0x9c, 0x94, 0x49, 0xa6, 0x92, 0xfb, 0x93, 0x20, 0x19, 0x28, 0x09, 0x65, 0x2a, 0x91, + 0x3a, 0x34, 0x93, 0xf2, 0xcb, 0xd7, 0x71, 0x5e, 0xfd, 0x74, 0x33, 0x95, 0x30, 0x37, 0x10, 0x36, + 0xfd, 0xf6, 0x07, 0x39, 0x22, 0x3b, 0x31, 0x47, 0x88, 0x20, 0x09, 0xb2, 0xd8, 0x37, 0x70, 0xe8, + 0x84, 0x8e, 0x20, 0x81, 0x4e, 0xab, 0x83, 0xd6, 0x10, 0x5f, 0x07, 0x1b, 0xc8, 0x83, 0xad, 0xa6, + 0xdd, 0xa9, 0x36, 0xe3, 0xd3, 0x20, 0x77, 0xc6, 0x32, 0xf3, 0x54, 0x82, 0x3f, 0x83, 0xa5, 0xf4, + 0xa4, 0x3c, 0x8d, 0xe4, 0x17, 0x2d, 0x28, 0xf9, 0x4d, 0xa9, 0xf2, 0xd3, 0x8a, 0x32, 0x14, 0x76, + 0xf7, 0x0e, 0xf6, 0xd7, 0xd6, 0xdb, 0xfc, 0xb7, 0x15, 0xeb, 0x7b, 0xba, 0x7e, 0xb8, 0xdf, 0xa9, + 0x67, 0x56, 0xff, 0x37, 0x0b, 0x99, 0xed, 0xf7, 0xe8, 0xf7, 0x21, 0xc7, 0x3f, 0x34, 0x4e, 0xf8, + 0xba, 0xdc, 0x9c, 0xf4, 0x2d, 0x15, 0xdf, 0xfd, 0xf9, 0xbf, 0xff, 0xd7, 0x2f, 0x33, 0x37, 0x71, + 0xbd, 0x35, 0xfe, 0xde, 0x31, 0xf1, 0x8c, 0xd6, 0xf9, 0xb8, 0xc5, 0xea, 0xc3, 0x6b, 0xed, 0x05, + 0x3a, 0x84, 0xec, 0xfe, 0xc8, 0x43, 0xa9, 0x5f, 0x9e, 0x9b, 0xe9, 0x9f, 0x58, 0xf1, 0x1d, 0x26, + 0x78, 0x1e, 0xd7, 0x14, 0xc1, 0xc3, 0x91, 0x47, 0xc5, 0x8e, 0xa0, 0xac, 0x7e, 0x24, 0xbd, 0xf2, + 0x93, 0x74, 0xf3, 0xea, 0x0f, 0xb0, 0xf8, 0x21, 0x53, 0x77, 0x17, 0xdf, 0x52, 0xd4, 0xf1, 0x4f, + 0xb9, 0xea, 0x6a, 0x3a, 0x17, 0x16, 0x4a, 0xfd, 0x68, 0xdd, 0x4c, 0xff, 0x2e, 0x9b, 0xb8, 0x1a, + 0xef, 0xc2, 0xa2, 0x62, 0x2d, 0xf1, 0x59, 0xb6, 0xeb, 0xa1, 0x07, 0x09, 0x9f, 0xe5, 0xd4, 0x0f, + 0x50, 0xcd, 0xa5, 0x74, 0x06, 0xa1, 0x68, 0x89, 0x29, 0x6a, 0xe2, 0x9b, 0x8a, 0xa2, 0xae, 0xcf, + 0xf6, 0x5a, 0x7b, 0xb1, 0x7a, 0x0a, 0x39, 0x86, 0x32, 0xa3, 0x3f, 0x90, 0x0f, 0xcd, 0x04, 0xe8, + 0x3c, 0x65, 0xf3, 0x43, 0xf8, 0x34, 0x6e, 0x30, 0x65, 0x08, 0x57, 0xa5, 0x32, 0x86, 0x33, 0xbf, + 0xd6, 0x5e, 0x2c, 0x6b, 0xdf, 0xd1, 0x56, 0xff, 0x67, 0x16, 0x72, 0x0c, 0x72, 0x42, 0x36, 0x40, + 0x80, 0xc8, 0x46, 0x57, 0x19, 0xc3, 0x78, 0xa3, 0xab, 0x8c, 0x83, 0xb9, 0x78, 0x91, 0x29, 0x6e, + 0xe0, 0x79, 0xa9, 0x98, 0xa1, 0x59, 0x2d, 0x06, 0xd0, 0x51, 0x9f, 0x8e, 0x05, 0xe8, 0xc6, 0xc3, + 0x0c, 0x25, 0x09, 0x0c, 0x21, 0xb3, 0xd1, 0x13, 0x92, 0x80, 0xca, 0x62, 0xcc, 0x74, 0xde, 0xc3, + 0xb7, 0x15, 0xcf, 0x72, 0xb5, 0x0e, 0x63, 0xa4, 0x7a, 0xff, 0x4c, 0x83, 0x5a, 0x18, 0x5b, 0x45, + 0x8f, 0x12, 0x24, 0x47, 0x21, 0xda, 0xe6, 0xe3, 0xc9, 0x4c, 0x69, 0x16, 0x70, 0xf5, 0xe7, 0x84, + 0x0c, 0x0d, 0xca, 0x28, 0x1c, 0x8f, 0xfe, 0x42, 0x83, 0xb9, 0x08, 0x60, 0x8a, 0x92, 0x34, 0xc4, + 0xe0, 0xd8, 0xe6, 0x93, 0x2b, 0xb8, 0x84, 0x21, 0x4f, 0x99, 0x21, 0x4b, 0xf8, 0x6e, 0xcc, 0x15, + 0x9e, 0x39, 0x20, 0x9e, 0x2d, 0x8c, 0xf1, 0xb7, 0x81, 0x83, 0x9b, 0x89, 0xdb, 0x10, 0x02, 0x4b, + 0x13, 0xb7, 0x21, 0x8c, 0x8c, 0x4e, 0xd8, 0x06, 0x8e, 0x68, 0xd2, 0x23, 0xfe, 0x7f, 0x59, 0x28, + 0xac, 0xf3, 0x1f, 0x38, 0x22, 0x17, 0x4a, 0x3e, 0x8a, 0x88, 0x16, 0x93, 0x10, 0x9d, 0xe0, 0xb6, + 0xd0, 0x7c, 0x90, 0xfa, 0x5e, 0x68, 0x7f, 0xc2, 0xb4, 0x3f, 0xc0, 0x4d, 0xa9, 0x5d, 0xfc, 0x8e, + 0xb2, 0xc5, 0xa1, 0x83, 0x96, 0xd1, 0xeb, 0xd1, 0x85, 0xff, 0x29, 0x54, 0x54, 0xa8, 0x0f, 0x3d, 0x4c, 0x44, 0x92, 0x54, 0xb4, 0xb0, 0x89, 0x27, 0xb1, 0x08, 0xed, 0xcb, 0x4c, 0x3b, 0xc6, 0xf7, 0x53, 0xb4, 0x3b, 0x8c, 0x3d, 0x64, 0x00, 0x87, 0xea, 0x92, 0x0d, 0x08, 0x21, 0x81, 0xc9, 0x06, 0x84, 0x91, 0xbe, 0x2b, 0x0d, 0x18, 0x31, 0x76, 0x6a, 0xc0, 0x07, 0x80, 0x00, 0x98, 0x43, 0x89, - 0x7e, 0x55, 0xae, 0x4e, 0xd1, 0x90, 0x8f, 0x63, 0x7a, 0xf1, 0x3d, 0x17, 0x51, 0xdd, 0x37, 0x5d, + 0x7e, 0x55, 0xae, 0x4e, 0xd1, 0x90, 0x8f, 0x63, 0x7a, 0xf1, 0x33, 0x17, 0x51, 0xdd, 0x37, 0x5d, 0x1a, 0xfa, 0xab, 0xbf, 0xca, 0x43, 0xf9, 0x9d, 0x61, 0x5a, 0x1e, 0xb1, 0x0c, 0xab, 0x4b, 0xd0, 0x09, 0xe4, 0x58, 0x69, 0x8c, 0x66, 0x39, 0x15, 0xaf, 0x8a, 0x66, 0xb9, 0x10, 0x98, 0x83, 0x1f, - 0x33, 0xcd, 0x8b, 0xf8, 0x8e, 0xd4, 0x3c, 0x08, 0xc4, 0xb7, 0x18, 0x0e, 0x43, 0x27, 0xfc, 0x87, - 0x90, 0x17, 0x10, 0x7f, 0x44, 0x58, 0x08, 0x9f, 0x69, 0xde, 0x4b, 0xee, 0x4c, 0xdb, 0x5e, 0xaa, - 0x2a, 0x97, 0xf1, 0x52, 0x5d, 0x1f, 0x01, 0x02, 0x90, 0x31, 0xea, 0xdc, 0x18, 0x26, 0xd9, 0x5c, - 0x4a, 0x67, 0x10, 0x7a, 0x9f, 0x33, 0xbd, 0x8f, 0xf0, 0x62, 0x92, 0xde, 0x9e, 0xcf, 0x4f, 0x75, - 0x1f, 0xc3, 0xec, 0xa6, 0xe1, 0x9e, 0xa1, 0x48, 0xb1, 0x53, 0x7e, 0x93, 0xd0, 0x6c, 0x26, 0x75, - 0x09, 0x4d, 0x8f, 0x98, 0xa6, 0xfb, 0xb8, 0x91, 0xa4, 0xe9, 0xcc, 0x70, 0x69, 0xf5, 0x40, 0x67, - 0x90, 0xe7, 0x3f, 0x53, 0x88, 0xfa, 0x32, 0xf4, 0x53, 0x87, 0xa8, 0x2f, 0xc3, 0xbf, 0x6c, 0xb8, - 0x9e, 0x26, 0x0f, 0x8a, 0xf2, 0xb7, 0x01, 0xe8, 0x7e, 0x64, 0x69, 0xc2, 0xbf, 0x23, 0x68, 0x2e, - 0xa6, 0x75, 0x0b, 0x7d, 0xcf, 0x98, 0xbe, 0x87, 0xf8, 0x5e, 0xe2, 0xda, 0x09, 0xee, 0xd7, 0xda, - 0x8b, 0xef, 0x68, 0xb4, 0x4c, 0x40, 0x00, 0xd4, 0xc6, 0xa2, 0x23, 0x8a, 0xf9, 0xc6, 0xa2, 0x23, - 0x86, 0xf1, 0xe2, 0x55, 0xa6, 0xfc, 0x15, 0x7e, 0x96, 0xa4, 0xdc, 0x73, 0x0c, 0xcb, 0x3d, 0x21, - 0xce, 0x27, 0x1c, 0x90, 0x73, 0xcf, 0xcc, 0x21, 0x8d, 0x94, 0xff, 0x9f, 0x83, 0x59, 0x7a, 0x1e, - 0xa5, 0xe5, 0x39, 0xb8, 0xc6, 0x47, 0xad, 0x89, 0x81, 0x67, 0x51, 0x6b, 0xe2, 0x08, 0x40, 0xbc, - 0x3c, 0xb3, 0x9f, 0xb2, 0x13, 0xc6, 0x44, 0xbd, 0xee, 0x42, 0x59, 0xb9, 0xeb, 0xa3, 0x04, 0x81, - 0x61, 0x64, 0x2e, 0x5a, 0x17, 0x12, 0x80, 0x02, 0xfc, 0x80, 0xe9, 0xbc, 0x83, 0x17, 0x42, 0x3a, - 0x7b, 0x9c, 0x8b, 0x2a, 0xfd, 0x63, 0xa8, 0xa8, 0x98, 0x00, 0x4a, 0x90, 0x19, 0x41, 0xfe, 0xa2, - 0x29, 0x31, 0x09, 0x52, 0x88, 0x67, 0x07, 0xff, 0x67, 0xfb, 0x92, 0x95, 0x2a, 0x1f, 0x42, 0x41, - 0x00, 0x05, 0x49, 0xb3, 0x0d, 0x43, 0x85, 0x49, 0xb3, 0x8d, 0xa0, 0x0c, 0xf1, 0x63, 0x1e, 0xd3, - 0x4a, 0xef, 0x43, 0xb2, 0x04, 0x09, 0x8d, 0x6f, 0x89, 0x97, 0xa6, 0x31, 0xc0, 0xbe, 0xd2, 0x34, - 0x2a, 0x77, 0xd1, 0x49, 0x1a, 0x4f, 0x89, 0x27, 0x62, 0x49, 0xde, 0xf3, 0x50, 0x8a, 0x40, 0x35, - 0xe5, 0xe3, 0x49, 0x2c, 0x69, 0xa7, 0xf2, 0x40, 0xa9, 0xc8, 0xf7, 0xe8, 0x67, 0x00, 0x01, 0xa4, - 0x11, 0x3d, 0x6d, 0x25, 0xe2, 0xa2, 0xd1, 0xd3, 0x56, 0x32, 0x2a, 0x12, 0xcf, 0x1f, 0x81, 0x6e, - 0x7e, 0x31, 0xa0, 0xda, 0xff, 0x56, 0x03, 0x14, 0x47, 0x40, 0xd0, 0xcb, 0x64, 0x0d, 0x89, 0x88, - 0x6b, 0xf3, 0xd5, 0xf5, 0x98, 0xd3, 0x4a, 0x44, 0x60, 0x56, 0x97, 0x8d, 0x18, 0x7e, 0xa0, 0x86, - 0xfd, 0x42, 0x83, 0x6a, 0x08, 0x42, 0x41, 0x4f, 0x53, 0xd6, 0x38, 0x02, 0xda, 0x36, 0x9f, 0x5d, - 0xc9, 0x97, 0x76, 0x12, 0x53, 0x76, 0x84, 0x3c, 0x88, 0xff, 0xa5, 0x06, 0xb5, 0x30, 0xec, 0x82, - 0x52, 0xe4, 0xc7, 0x80, 0xdf, 0xe6, 0xf2, 0xd5, 0x8c, 0x57, 0x2f, 0x55, 0x70, 0x36, 0x1f, 0x42, - 0x41, 0x80, 0x35, 0x49, 0x01, 0x11, 0x86, 0x8d, 0x93, 0x02, 0x22, 0x82, 0xf4, 0xa4, 0x04, 0x84, - 0x63, 0xf7, 0x89, 0x12, 0x82, 0x02, 0xd1, 0x49, 0xd3, 0x38, 0x39, 0x04, 0x23, 0x70, 0xd0, 0x24, - 0x8d, 0x41, 0x08, 0x4a, 0x38, 0x07, 0xa5, 0x08, 0xbc, 0x22, 0x04, 0xa3, 0x68, 0x50, 0x4a, 0x08, - 0x32, 0xa5, 0x4a, 0x08, 0x06, 0xe0, 0x4b, 0x52, 0x08, 0xc6, 0x10, 0xf1, 0xa4, 0x10, 0x8c, 0xe3, - 0x37, 0x29, 0xeb, 0xca, 0x74, 0x87, 0x42, 0x70, 0x3e, 0x01, 0xab, 0x41, 0xaf, 0x52, 0x1c, 0x9a, - 0x08, 0xb6, 0x37, 0x3f, 0xb9, 0x26, 0xf7, 0xc4, 0xbd, 0xcf, 0x97, 0x42, 0xee, 0xfd, 0x7f, 0xd0, - 0x60, 0x21, 0x09, 0xeb, 0x41, 0x29, 0xba, 0x52, 0x80, 0xfa, 0xe6, 0xca, 0x75, 0xd9, 0xaf, 0xf6, - 0x9a, 0x1f, 0x0d, 0x6f, 0xea, 0xff, 0xf2, 0xc5, 0xa2, 0xf6, 0x6f, 0x5f, 0x2c, 0x6a, 0xff, 0xf1, - 0xc5, 0xa2, 0xf6, 0x77, 0xff, 0xb9, 0x38, 0x73, 0x9c, 0x67, 0xff, 0x81, 0xec, 0x7b, 0xbf, 0x09, - 0x00, 0x00, 0xff, 0xff, 0x62, 0x18, 0xc8, 0xf6, 0xd0, 0x36, 0x00, 0x00, + 0x33, 0xcd, 0x8b, 0xf8, 0x8e, 0xd4, 0x3c, 0x08, 0xc4, 0xb7, 0x18, 0x0e, 0x43, 0x17, 0xfc, 0x87, + 0x90, 0x17, 0x10, 0x7f, 0x44, 0x58, 0x08, 0x9f, 0x69, 0xde, 0x4b, 0x7e, 0x99, 0x76, 0xbc, 0x54, + 0x55, 0x2e, 0xe3, 0xa5, 0xba, 0x3e, 0x02, 0x04, 0x20, 0x63, 0xd4, 0xb9, 0x31, 0x4c, 0xb2, 0xb9, + 0x94, 0xce, 0x20, 0xf4, 0x3e, 0x67, 0x7a, 0x1f, 0xe1, 0xc5, 0x24, 0xbd, 0x3d, 0x9f, 0x9f, 0xea, + 0x3e, 0x86, 0xd9, 0x4d, 0xc3, 0x3d, 0x43, 0x91, 0x62, 0xa7, 0xfc, 0x26, 0xa1, 0xd9, 0x4c, 0x7a, + 0x25, 0x34, 0x3d, 0x62, 0x9a, 0xee, 0xe3, 0x46, 0x92, 0xa6, 0x33, 0xc3, 0xa5, 0xd5, 0x03, 0x9d, + 0x41, 0x9e, 0xff, 0x4c, 0x21, 0xea, 0xcb, 0xd0, 0x4f, 0x1d, 0xa2, 0xbe, 0x0c, 0xff, 0xb2, 0xe1, + 0x7a, 0x9a, 0x3c, 0x28, 0xca, 0xdf, 0x06, 0xa0, 0xfb, 0x91, 0xad, 0x09, 0xff, 0x8e, 0xa0, 0xb9, + 0x98, 0xf6, 0x5a, 0xe8, 0x7b, 0xc6, 0xf4, 0x3d, 0xc4, 0xf7, 0x12, 0xf7, 0x4e, 0x70, 0xbf, 0xd6, + 0x5e, 0x7c, 0x47, 0xa3, 0x65, 0x02, 0x02, 0xa0, 0x36, 0x16, 0x1d, 0x51, 0xcc, 0x37, 0x16, 0x1d, + 0x31, 0x8c, 0x17, 0xaf, 0x32, 0xe5, 0xaf, 0xf0, 0xb3, 0x24, 0xe5, 0x9e, 0x63, 0x58, 0xee, 0x09, + 0x71, 0x3e, 0xe1, 0x80, 0x9c, 0x7b, 0x66, 0x0e, 0x69, 0xa4, 0xfc, 0xff, 0x1c, 0xcc, 0xd2, 0x7e, + 0x94, 0x96, 0xe7, 0xe0, 0x1a, 0x1f, 0xb5, 0x26, 0x06, 0x9e, 0x45, 0xad, 0x89, 0x23, 0x00, 0xf1, + 0xf2, 0xcc, 0x7e, 0xca, 0x4e, 0x18, 0x13, 0xf5, 0xba, 0x0b, 0x65, 0xe5, 0xae, 0x8f, 0x12, 0x04, + 0x86, 0x91, 0xb9, 0x68, 0x5d, 0x48, 0x00, 0x0a, 0xf0, 0x03, 0xa6, 0xf3, 0x0e, 0x5e, 0x08, 0xe9, + 0xec, 0x71, 0x2e, 0xaa, 0xf4, 0x8f, 0xa1, 0xa2, 0x62, 0x02, 0x28, 0x41, 0x66, 0x04, 0xf9, 0x8b, + 0xa6, 0xc4, 0x24, 0x48, 0x21, 0x9e, 0x1d, 0xfc, 0x9f, 0xed, 0x4b, 0x56, 0xaa, 0x7c, 0x08, 0x05, + 0x01, 0x14, 0x24, 0xad, 0x36, 0x0c, 0x15, 0x26, 0xad, 0x36, 0x82, 0x32, 0xc4, 0xdb, 0x3c, 0xa6, + 0x95, 0xde, 0x87, 0x64, 0x09, 0x12, 0x1a, 0xdf, 0x12, 0x2f, 0x4d, 0x63, 0x80, 0x7d, 0xa5, 0x69, + 0x54, 0xee, 0xa2, 0x93, 0x34, 0x9e, 0x12, 0x4f, 0xc4, 0x92, 0xbc, 0xe7, 0xa1, 0x14, 0x81, 0x6a, + 0xca, 0xc7, 0x93, 0x58, 0xd2, 0xba, 0xf2, 0x40, 0xa9, 0xc8, 0xf7, 0xe8, 0x67, 0x00, 0x01, 0xa4, + 0x11, 0xed, 0xb6, 0x12, 0x71, 0xd1, 0x68, 0xb7, 0x95, 0x8c, 0x8a, 0xc4, 0xf3, 0x47, 0xa0, 0x9b, + 0x5f, 0x0c, 0xa8, 0xf6, 0xbf, 0xd5, 0x00, 0xc5, 0x11, 0x10, 0xf4, 0x32, 0x59, 0x43, 0x22, 0xe2, + 0xda, 0x7c, 0x75, 0x3d, 0xe6, 0xb4, 0x12, 0x11, 0x98, 0xd5, 0x65, 0x33, 0x86, 0x1f, 0xa8, 0x61, + 0xbf, 0xd0, 0xa0, 0x1a, 0x82, 0x50, 0xd0, 0xd3, 0x94, 0x3d, 0x8e, 0x80, 0xb6, 0xcd, 0x67, 0x57, + 0xf2, 0xa5, 0x75, 0x62, 0xca, 0x89, 0x90, 0x8d, 0xf8, 0x5f, 0x6a, 0x50, 0x0b, 0xc3, 0x2e, 0x28, + 0x45, 0x7e, 0x0c, 0xf8, 0x6d, 0x2e, 0x5f, 0xcd, 0x78, 0xf5, 0x56, 0x05, 0xbd, 0xf9, 0x10, 0x0a, + 0x02, 0xac, 0x49, 0x0a, 0x88, 0x30, 0x6c, 0x9c, 0x14, 0x10, 0x11, 0xa4, 0x27, 0x25, 0x20, 0x1c, + 0xbb, 0x4f, 0x94, 0x10, 0x14, 0x88, 0x4e, 0x9a, 0xc6, 0xc9, 0x21, 0x18, 0x81, 0x83, 0x26, 0x69, + 0x0c, 0x42, 0x50, 0xc2, 0x39, 0x28, 0x45, 0xe0, 0x15, 0x21, 0x18, 0x45, 0x83, 0x52, 0x42, 0x90, + 0x29, 0x55, 0x42, 0x30, 0x00, 0x5f, 0x92, 0x42, 0x30, 0x86, 0x88, 0x27, 0x85, 0x60, 0x1c, 0xbf, + 0x49, 0xd9, 0x57, 0xa6, 0x3b, 0x14, 0x82, 0xf3, 0x09, 0x58, 0x0d, 0x7a, 0x95, 0xe2, 0xd0, 0x44, + 0xb0, 0xbd, 0xf9, 0xc9, 0x35, 0xb9, 0x27, 0x9e, 0x7d, 0xbe, 0x15, 0xf2, 0xec, 0xff, 0x83, 0x06, + 0x0b, 0x49, 0x58, 0x0f, 0x4a, 0xd1, 0x95, 0x02, 0xd4, 0x37, 0x57, 0xae, 0xcb, 0x7e, 0xb5, 0xd7, + 0xfc, 0x68, 0x78, 0x53, 0xff, 0x97, 0x2f, 0x16, 0xb5, 0x7f, 0xfb, 0x62, 0x51, 0xfb, 0x8f, 0x2f, + 0x16, 0xb5, 0xbf, 0xfb, 0xcf, 0xc5, 0x99, 0xe3, 0x3c, 0xfb, 0x0f, 0x64, 0xdf, 0xfb, 0x4d, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x80, 0x82, 0x49, 0x96, 0xd9, 0x36, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 7302215db31..329e8f61c48 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -3,7 +3,7 @@ package etcdserverpb; import "gogoproto/gogo.proto"; import "etcd/internal/mvcc/mvccpb/kv.proto"; -import "etcd/auth/authpb/auth.proto"; +import "etcd/internal/auth/authpb/auth.proto"; // for grpc-gateway import "google/api/annotations.proto"; diff --git a/etcdserver/server.go b/etcdserver/server.go index 87aeed6587a..d55b3ee7714 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -29,13 +29,13 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/auth" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" "github.com/coreos/etcd/etcdserver/stats" "github.com/coreos/etcd/internal/alarm" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/compactor" "github.com/coreos/etcd/internal/discovery" "github.com/coreos/etcd/internal/lease" diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index a668970992a..d506b1ab0da 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -20,9 +20,9 @@ import ( "encoding/binary" "time" - "github.com/coreos/etcd/auth" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/membership" + "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/lease" "github.com/coreos/etcd/internal/lease/leasehttp" "github.com/coreos/etcd/internal/mvcc" diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 97017a07fae..2c80c743be4 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth/authpb" "github.com/coreos/etcd/pkg/testutil" ) diff --git a/auth/authpb/auth.pb.go b/internal/auth/authpb/auth.pb.go similarity index 100% rename from auth/authpb/auth.pb.go rename to internal/auth/authpb/auth.pb.go diff --git a/auth/authpb/auth.proto b/internal/auth/authpb/auth.proto similarity index 100% rename from auth/authpb/auth.proto rename to internal/auth/authpb/auth.proto diff --git a/auth/doc.go b/internal/auth/doc.go similarity index 100% rename from auth/doc.go rename to internal/auth/doc.go diff --git a/auth/jwt.go b/internal/auth/jwt.go similarity index 100% rename from auth/jwt.go rename to internal/auth/jwt.go diff --git a/auth/jwt_test.go b/internal/auth/jwt_test.go similarity index 95% rename from auth/jwt_test.go rename to internal/auth/jwt_test.go index 35e11dee253..36b50f9ad40 100644 --- a/auth/jwt_test.go +++ b/internal/auth/jwt_test.go @@ -20,8 +20,8 @@ import ( ) const ( - jwtPubKey = "../integration/fixtures/server.crt" - jwtPrivKey = "../integration/fixtures/server.key.insecure" + jwtPubKey = "../../integration/fixtures/server.crt" + jwtPrivKey = "../../integration/fixtures/server.key.insecure" ) func TestJWTInfo(t *testing.T) { diff --git a/auth/range_perm_cache.go b/internal/auth/range_perm_cache.go similarity index 98% rename from auth/range_perm_cache.go rename to internal/auth/range_perm_cache.go index 62acdf26d76..241239358c9 100644 --- a/auth/range_perm_cache.go +++ b/internal/auth/range_perm_cache.go @@ -15,7 +15,7 @@ package auth import ( - "github.com/coreos/etcd/auth/authpb" + "github.com/coreos/etcd/internal/auth/authpb" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/pkg/adt" ) diff --git a/auth/range_perm_cache_test.go b/internal/auth/range_perm_cache_test.go similarity index 97% rename from auth/range_perm_cache_test.go rename to internal/auth/range_perm_cache_test.go index fd8df6a9e0c..c0a0ae6bc38 100644 --- a/auth/range_perm_cache_test.go +++ b/internal/auth/range_perm_cache_test.go @@ -17,7 +17,7 @@ package auth import ( "testing" - "github.com/coreos/etcd/auth/authpb" + "github.com/coreos/etcd/internal/auth/authpb" "github.com/coreos/etcd/pkg/adt" ) diff --git a/auth/simple_token.go b/internal/auth/simple_token.go similarity index 100% rename from auth/simple_token.go rename to internal/auth/simple_token.go diff --git a/auth/simple_token_test.go b/internal/auth/simple_token_test.go similarity index 100% rename from auth/simple_token_test.go rename to internal/auth/simple_token_test.go diff --git a/auth/store.go b/internal/auth/store.go similarity index 99% rename from auth/store.go rename to internal/auth/store.go index e935608967f..7796c5d8acc 100644 --- a/auth/store.go +++ b/internal/auth/store.go @@ -24,8 +24,8 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/auth/authpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth/authpb" "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/pkg/capnslog" diff --git a/auth/store_test.go b/internal/auth/store_test.go similarity index 99% rename from auth/store_test.go rename to internal/auth/store_test.go index 739d8fcde6b..2aa7d51a83d 100644 --- a/auth/store_test.go +++ b/internal/auth/store_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/internal/auth/authpb" "github.com/coreos/etcd/internal/mvcc/backend" "golang.org/x/crypto/bcrypt" diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 09b90bed3c1..899538d02c2 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -16,7 +16,7 @@ if [[ $(protoc --version | cut -f2 -d' ') != "3.5.1" ]]; then fi # directories containing protos to be built -DIRS="./wal/walpb ./etcdserver/etcdserverpb ./internal/raftsnap/snappb ./raft/raftpb ./internal/mvcc/mvccpb ./internal/lease/leasepb ./auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb" +DIRS="./wal/walpb ./etcdserver/etcdserverpb ./internal/raftsnap/snappb ./raft/raftpb ./internal/mvcc/mvccpb ./internal/lease/leasepb ./internal/auth/authpb ./etcdserver/api/v3lock/v3lockpb ./etcdserver/api/v3election/v3electionpb" # exact version of packages to build GOGO_PROTO_SHA="41168f6614b7bb144818ec8967b8c702705df564" @@ -128,7 +128,7 @@ if [ "$1" = "-g" ]; then echo "protodoc is updated" popd - protodoc --directories="etcdserver/etcdserverpb=service_message,internal/mvcc/mvccpb=service_message,internal/lease/leasepb=service_message,auth/authpb=service_message" \ + protodoc --directories="etcdserver/etcdserverpb=service_message,internal/mvcc/mvccpb=service_message,internal/lease/leasepb=service_message,internal/auth/authpb=service_message" \ --title="etcd API Reference" \ --output="Documentation/dev-guide/api_reference_v3.md" \ --message-only-from-this-file="etcdserver/etcdserverpb/rpc.proto" \