diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto index 2a7362293fc3e..aae82e5717498 100644 --- a/api/proto/teleport/legacy/types/types.proto +++ b/api/proto/teleport/legacy/types/types.proto @@ -7072,6 +7072,8 @@ message ServerInfoSpecV1 { // JamfSpecV1 is the base configuration for the Jamf MDM service. message JamfSpecV1 { + reserved 5, 6, 8, 9; + reserved "username", "password", "client_id", "client_secret"; option (gogoproto.equal) = true; // Enabled toggles the service on or off. bool enabled = 1 [(gogoproto.jsontag) = "enabled,omitempty"]; @@ -7090,29 +7092,9 @@ message JamfSpecV1 { // Example: "https://yourtenant.jamfcloud.com/api". // Required. string api_endpoint = 4 [(gogoproto.jsontag) = "api_endpoint,omitempty"]; - // Jamf API username. - // Username and password are used to acquire short-lived Jamf Pro API tokens. - // See https://developer.jamf.com/jamf-pro/docs/jamf-pro-api-overview. - // Prefer using client_id and client_secret. - // Either username+password or client_id+client_secret are required. - string username = 5 [(gogoproto.jsontag) = "username,omitempty"]; - // Jamf API password. - // Username and password are used to acquire short-lived Jamf Pro API tokens. - // See https://developer.jamf.com/jamf-pro/docs/jamf-pro-api-overview. - // Prefer using client_id and client_secret. - // Either username+password or client_id+client_secret are required. - string password = 6 [(gogoproto.jsontag) = "password,omitempty"]; // Inventory sync entries. // If empty a default sync configuration is used. repeated JamfInventoryEntry inventory = 7 [(gogoproto.jsontag) = "inventory,omitempty"]; - // Jamf API client ID. - // See https://developer.jamf.com/jamf-pro/docs/client-credentials. - // Either username+password or client_id+client_secret are required. - string client_id = 8 [(gogoproto.jsontag) = "client_id,omitempty"]; - // Jamf API client secret. - // See https://developer.jamf.com/jamf-pro/docs/client-credentials. - // Either username+password or client_id+client_secret are required. - string client_secret = 9 [(gogoproto.jsontag) = "client_secret,omitempty"]; } // JamfInventoryEntry is an inventory sync entry for [JamfSpecV1]. diff --git a/api/types/jamf.go b/api/types/jamf.go index 3bad0084603e3..0d2074a1f515a 100644 --- a/api/types/jamf.go +++ b/api/types/jamf.go @@ -44,13 +44,6 @@ func ValidateJamfSpecV1(s *JamfSpecV1) error { return trace.BadParameter("spec required") } - // Jamf can handle both credential sets being present, so we let it pass. - hasUserPass := s.Username != "" && s.Password != "" - hasAPICreds := s.ClientId != "" && s.ClientSecret != "" - if !hasUserPass && !hasAPICreds { - return trace.BadParameter("either username+password or clientID+clientSecret must be provided") - } - switch u, err := url.Parse(s.ApiEndpoint); { case err != nil: return trace.BadParameter("invalid API endpoint: %v", err) diff --git a/api/types/jamf_test.go b/api/types/jamf_test.go index d997cc3e518f6..2043cff1018f7 100644 --- a/api/types/jamf_test.go +++ b/api/types/jamf_test.go @@ -29,8 +29,6 @@ func TestValidateJamfSpecV1(t *testing.T) { validSpec := &types.JamfSpecV1{ Enabled: true, ApiEndpoint: "https://yourtenant.jamfcloud.com", - Username: "llama", - Password: "supersecret!!1!", } validEntry := &types.JamfInventoryEntry{ FilterRsql: "", // no filters @@ -59,8 +57,6 @@ func TestValidateJamfSpecV1(t *testing.T) { spec: &types.JamfSpecV1{ Enabled: true, ApiEndpoint: "https://yourtenant.jamfcloud.com", - Username: "llama", - Password: "supersecret!!1!", Inventory: []*types.JamfInventoryEntry{ { FilterRsql: `general.remoteManagement.managed==true and general.platform=="Mac"`, @@ -76,36 +72,6 @@ func TestValidateJamfSpecV1(t *testing.T) { }, }, }, - { - name: "all fields", - spec: &types.JamfSpecV1{ - Enabled: true, - Name: "jamf2", - SyncDelay: types.Duration(2 * time.Minute), - ApiEndpoint: "https://yourtenant.jamfcloud.com", - Username: "llama", - Password: "supersecret!!1!", - Inventory: []*types.JamfInventoryEntry{ - { - FilterRsql: `general.remoteManagement.managed==true and general.platform=="Mac"`, - SyncPeriodPartial: types.Duration(4 * time.Hour), - SyncPeriodFull: types.Duration(48 * time.Hour), - OnMissing: "DELETE", - }, - }, - ClientId: "llama-UUID", // "duplicate" creds are fine - ClientSecret: "supersecretsecret!!1!", - }, - }, - { - name: "using API credentials", - spec: modify(func(spec *types.JamfSpecV1) { - spec.Username = "" - spec.Password = "" - spec.ClientId = "llama-UUID" - spec.ClientSecret = "supersecretsecret!11!" - }), - }, { name: "nil spec", spec: nil, @@ -125,38 +91,6 @@ func TestValidateJamfSpecV1(t *testing.T) { }), wantErr: "missing hostname", }, - { - name: "username empty", - spec: modify(func(spec *types.JamfSpecV1) { - spec.Username = "" - }), - wantErr: "username", - }, - { - name: "password empty", - spec: modify(func(spec *types.JamfSpecV1) { - spec.Password = "" - }), - wantErr: "password", - }, - { - name: "client_id empty", - spec: modify(func(spec *types.JamfSpecV1) { - spec.Username = "" - spec.Password = "" - spec.ClientSecret = "supersecretsecret!!1!" - }), - wantErr: "clientID", - }, - { - name: "client_secret empty", - spec: modify(func(spec *types.JamfSpecV1) { - spec.Username = "" - spec.Password = "" - spec.ClientId = "llama-UUID" - }), - wantErr: "clientSecret", - }, { name: "inventory nil entry", spec: modify(func(spec *types.JamfSpecV1) { diff --git a/api/types/types.pb.go b/api/types/types.pb.go index c10908f56200e..e39102fbb376a 100644 --- a/api/types/types.pb.go +++ b/api/types/types.pb.go @@ -18802,32 +18802,12 @@ type JamfSpecV1 struct { // Example: "https://yourtenant.jamfcloud.com/api". // Required. ApiEndpoint string `protobuf:"bytes,4,opt,name=api_endpoint,json=apiEndpoint,proto3" json:"api_endpoint,omitempty"` - // Jamf API username. - // Username and password are used to acquire short-lived Jamf Pro API tokens. - // See https://developer.jamf.com/jamf-pro/docs/jamf-pro-api-overview. - // Prefer using client_id and client_secret. - // Either username+password or client_id+client_secret are required. - Username string `protobuf:"bytes,5,opt,name=username,proto3" json:"username,omitempty"` - // Jamf API password. - // Username and password are used to acquire short-lived Jamf Pro API tokens. - // See https://developer.jamf.com/jamf-pro/docs/jamf-pro-api-overview. - // Prefer using client_id and client_secret. - // Either username+password or client_id+client_secret are required. - Password string `protobuf:"bytes,6,opt,name=password,proto3" json:"password,omitempty"` // Inventory sync entries. // If empty a default sync configuration is used. - Inventory []*JamfInventoryEntry `protobuf:"bytes,7,rep,name=inventory,proto3" json:"inventory,omitempty"` - // Jamf API client ID. - // See https://developer.jamf.com/jamf-pro/docs/client-credentials. - // Either username+password or client_id+client_secret are required. - ClientId string `protobuf:"bytes,8,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - // Jamf API client secret. - // See https://developer.jamf.com/jamf-pro/docs/client-credentials. - // Either username+password or client_id+client_secret are required. - ClientSecret string `protobuf:"bytes,9,opt,name=client_secret,json=clientSecret,proto3" json:"client_secret,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Inventory []*JamfInventoryEntry `protobuf:"bytes,7,rep,name=inventory,proto3" json:"inventory,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *JamfSpecV1) Reset() { *m = JamfSpecV1{} } @@ -19933,7 +19913,7 @@ func init() { func init() { proto.RegisterFile("teleport/legacy/types/types.proto", fileDescriptor_9198ee693835762e) } var fileDescriptor_9198ee693835762e = []byte{ - // 27555 bytes of a gzipped FileDescriptorProto + // 27545 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xbd, 0x6d, 0x70, 0x1c, 0x49, 0x76, 0x20, 0x36, 0xdd, 0x8d, 0x8f, 0xc6, 0xc3, 0x57, 0x23, 0x01, 0x92, 0x20, 0x66, 0x48, 0x70, 0x8a, 0x33, 0x1c, 0x72, 0x3e, 0xc8, 0x25, 0xb8, 0xc3, 0xdd, 0xd9, 0xf9, 0x6c, 0xa0, 0x41, 0xa2, @@ -21413,250 +21393,249 @@ var fileDescriptor_9198ee693835762e = []byte{ 0x8d, 0xfa, 0x4f, 0x73, 0x70, 0xaa, 0x2f, 0x05, 0x79, 0x0e, 0x8a, 0xe5, 0xcd, 0xea, 0x56, 0x3c, 0xb2, 0x6c, 0xb5, 0x48, 0x08, 0xb9, 0x0e, 0x63, 0xcb, 0x6e, 0xe8, 0xd5, 0xd9, 0x04, 0xce, 0x34, 0x1a, 0xa5, 0xd8, 0x2a, 0xf4, 0xb5, 0x67, 0xec, 0x98, 0x96, 0x38, 0x30, 0x83, 0xab, 0x20, 0xf5, - 0xda, 0x6b, 0xd2, 0x60, 0x90, 0x62, 0xf8, 0xff, 0x53, 0x77, 0x35, 0xbf, 0x6d, 0x5c, 0xd7, 0xde, - 0x43, 0x52, 0xb2, 0x74, 0xa8, 0x8f, 0xd1, 0x8d, 0x62, 0x2b, 0xb2, 0x2c, 0x3b, 0x13, 0xdb, 0xb1, - 0x99, 0xc4, 0x89, 0xe3, 0x97, 0x0f, 0xe7, 0xbd, 0xbc, 0x64, 0x44, 0x0e, 0xc5, 0x89, 0xc8, 0x21, - 0x33, 0x33, 0x94, 0xe2, 0x7c, 0x0d, 0x18, 0x71, 0x2c, 0xf1, 0x85, 0x1a, 0x32, 0x9c, 0xa1, 0x1d, - 0x67, 0xf3, 0xde, 0xdb, 0xa4, 0x40, 0xdb, 0xf4, 0x23, 0xe8, 0xa2, 0x28, 0x0a, 0x14, 0x05, 0xb2, - 0xe8, 0xff, 0xd0, 0x7f, 0x20, 0x40, 0x10, 0x20, 0x8b, 0xae, 0x5a, 0x20, 0x68, 0x0d, 0xb4, 0x8b, - 0x76, 0x59, 0x74, 0x93, 0x55, 0x71, 0xbf, 0x66, 0xee, 0xcc, 0x90, 0xb4, 0x64, 0x3b, 0x2d, 0xb2, - 0x92, 0x78, 0xef, 0x39, 0x77, 0xee, 0xcc, 0xfd, 0x3a, 0xe7, 0x9e, 0x73, 0x7e, 0x27, 0xc5, 0x86, - 0x77, 0x98, 0x54, 0x61, 0x72, 0xf1, 0xdd, 0xe4, 0x52, 0xc8, 0xf8, 0x0e, 0x1e, 0x01, 0xd8, 0xeb, - 0x22, 0xcc, 0x34, 0xb8, 0xf1, 0x43, 0xf0, 0x5f, 0xe3, 0x86, 0x0e, 0x33, 0xac, 0x55, 0x7e, 0x28, - 0x71, 0xad, 0xfe, 0xee, 0x2f, 0x22, 0xa4, 0x01, 0x68, 0x4f, 0x4e, 0x03, 0xd0, 0xbe, 0xc7, 0x34, - 0x00, 0xca, 0x6f, 0x18, 0xec, 0xa6, 0xde, 0x6e, 0x24, 0x32, 0x53, 0xdd, 0xaf, 0x1f, 0xa2, 0x16, - 0x9b, 0x9d, 0x8f, 0x09, 0xa9, 0x49, 0xd2, 0xcf, 0x1a, 0xef, 0x8e, 0x28, 0x4c, 0xd5, 0xbf, 0x64, - 0x60, 0x6d, 0x12, 0xfb, 0xc8, 0x24, 0x5a, 0xd2, 0xd1, 0x92, 0x68, 0x5d, 0x82, 0x19, 0x5a, 0x16, - 0xcf, 0x4c, 0xcc, 0x58, 0xf1, 0x07, 0xe7, 0xd5, 0xe8, 0x31, 0x98, 0x56, 0x8b, 0x56, 0x94, 0x3b, - 0x81, 0x78, 0xc3, 0xb4, 0x76, 0x7d, 0xe2, 0x67, 0xc1, 0xaa, 0xd0, 0xbb, 0xe9, 0x74, 0x21, 0x2c, - 0x69, 0xc2, 0x29, 0xe1, 0x83, 0xa4, 0x10, 0x71, 0x49, 0x7f, 0x23, 0x04, 0x57, 0x06, 0x8a, 0x68, - 0xa6, 0x53, 0x8f, 0x28, 0x30, 0xdd, 0x18, 0xb8, 0xbe, 0x1b, 0x88, 0x9e, 0x2a, 0x7d, 0x52, 0x62, - 0xb2, 0x1a, 0xe6, 0x47, 0xd2, 0xba, 0x4d, 0xc3, 0x06, 0xa7, 0xc5, 0x50, 0x6e, 0xe2, 0x78, 0x82, - 0x8b, 0x4d, 0x81, 0x44, 0xf9, 0x9e, 0x04, 0xcb, 0xa3, 0xba, 0x85, 0xd6, 0x20, 0xe7, 0x8d, 0x4c, - 0x74, 0xe2, 0xd1, 0xe0, 0xa5, 0x3c, 0xc9, 0x0a, 0x7b, 0xa3, 0x37, 0x38, 0x68, 0x05, 0xa2, 0x7b, - 0x8e, 0x50, 0x6c, 0x02, 0xfe, 0x51, 0x26, 0xff, 0xa3, 0x33, 0x7c, 0xb3, 0xcd, 0xa6, 0x52, 0xa3, - 0x90, 0x3f, 0x8a, 0x0a, 0xa0, 0xb7, 0x1b, 0xf5, 0x3e, 0x05, 0x58, 0xbd, 0x0a, 0x39, 0xdc, 0xad, - 0xc4, 0x64, 0xc4, 0xd3, 0x41, 0xad, 0x55, 0x19, 0x11, 0xed, 0x95, 0xdf, 0x3a, 0xe8, 0x9a, 0x84, - 0x58, 0xd9, 0x81, 0x85, 0x38, 0x05, 0xd2, 0xe2, 0x90, 0x5c, 0xf9, 0x67, 0x65, 0xd6, 0xd2, 0x46, - 0xaf, 0x47, 0x5d, 0x44, 0x37, 0x1e, 0xf9, 0xfd, 0xd7, 0x67, 0x00, 0xff, 0xa4, 0x3c, 0xa3, 0x20, - 0xbb, 0x94, 0x1f, 0x67, 0x60, 0x39, 0x8a, 0x4a, 0xe3, 0x4b, 0xe2, 0x3b, 0x1b, 0x22, 0xa1, 0xc6, - 0x5c, 0xf8, 0xb9, 0xc4, 0x94, 0x7e, 0xc1, 0x09, 0x9e, 0xc3, 0x9b, 0xb0, 0x32, 0x8e, 0x1e, 0x3d, - 0x91, 0xca, 0xda, 0xce, 0x20, 0x1b, 0xc2, 0xf4, 0xee, 0x42, 0x12, 0xf7, 0x2f, 0x25, 0x58, 0x65, - 0x8e, 0x8d, 0xb5, 0x56, 0xc7, 0x0b, 0x5c, 0xaf, 0xe5, 0xed, 0xba, 0x0f, 0x26, 0xc4, 0x67, 0x33, - 0xb6, 0x2d, 0x9d, 0x8f, 0xfb, 0xaf, 0xa6, 0x9e, 0x36, 0xfe, 0x6d, 0xd1, 0x25, 0x02, 0xce, 0xb1, - 0x4b, 0x27, 0x6f, 0x8e, 0x86, 0x54, 0x7a, 0xb8, 0x40, 0x0c, 0xa9, 0x24, 0x14, 0xca, 0xff, 0xc2, - 0xfa, 0xe4, 0x07, 0xa0, 0x77, 0x60, 0x9e, 0x00, 0xda, 0x37, 0xfb, 0x7b, 0x83, 0x56, 0xdb, 0xe5, - 0x77, 0x5a, 0xfc, 0x4a, 0x51, 0xac, 0xa3, 0x80, 0x24, 0x2c, 0xc4, 0x6f, 0x8f, 0x40, 0xe5, 0x33, - 0xa6, 0x98, 0xf7, 0xb0, 0xd8, 0x9a, 0xf2, 0x7f, 0x12, 0xa0, 0x74, 0x1b, 0xe8, 0x79, 0x98, 0x6b, - 0xda, 0x45, 0x2b, 0x68, 0x0d, 0x82, 0x4a, 0x6f, 0x38, 0x60, 0x40, 0x1f, 0x34, 0xe2, 0x2b, 0xd8, - 0xc5, 0x3b, 0xc3, 0x20, 0x70, 0xf6, 0x7b, 0xc3, 0x81, 0x19, 0xa3, 0x23, 0xa8, 0xf9, 0xae, 0xfb, - 0x7e, 0xbb, 0x75, 0x3b, 0x8e, 0x9a, 0xcf, 0xca, 0x62, 0xa8, 0xf9, 0xac, 0x4c, 0xf9, 0x4c, 0x82, - 0x53, 0xdc, 0xe3, 0xa1, 0x3d, 0xa2, 0x2f, 0x45, 0x12, 0xd7, 0x3c, 0xe0, 0x40, 0x67, 0x93, 0x64, - 0xd3, 0x25, 0x1e, 0xfa, 0x4f, 0x3a, 0x48, 0x84, 0x54, 0xca, 0x8b, 0x5e, 0x85, 0x9c, 0x15, 0xf4, - 0xfa, 0x87, 0x88, 0xfd, 0x97, 0xc3, 0x11, 0x0d, 0x7a, 0x7d, 0xd2, 0x04, 0xe1, 0x54, 0x5c, 0x58, - 0x16, 0x3b, 0xc7, 0x7b, 0x8c, 0x6a, 0x70, 0x9c, 0x21, 0xc1, 0x24, 0xac, 0x43, 0x13, 0xde, 0x69, - 0x63, 0x91, 0x03, 0x0c, 0x30, 0xa0, 0x2d, 0x93, 0xb7, 0xa1, 0xfc, 0x48, 0x82, 0x3c, 0x16, 0x1e, - 0x88, 0x3a, 0x76, 0xbf, 0x53, 0x3a, 0x2e, 0x07, 0x72, 0xe3, 0x62, 0xd8, 0xfc, 0xa1, 0x0e, 0xd7, - 0xe7, 0x60, 0x31, 0xc1, 0x80, 0x14, 0x12, 0x5a, 0xda, 0xed, 0xec, 0xb6, 0x28, 0x08, 0x37, 0xb5, - 0xcc, 0xc5, 0xca, 0x94, 0xef, 0x4b, 0xb0, 0x8c, 0x95, 0x77, 0x9d, 0xdc, 0xdb, 0x9a, 0xc3, 0x2e, - 0x5f, 0xef, 0x58, 0x20, 0xe2, 0xae, 0x33, 0x34, 0xec, 0x8d, 0x0a, 0x44, 0xac, 0xcc, 0x0c, 0x6b, - 0x51, 0x05, 0x66, 0xd8, 0xf9, 0xe2, 0x33, 0x7c, 0xac, 0x75, 0xe1, 0x56, 0x20, 0x6a, 0x98, 0x11, - 0xe1, 0x37, 0x21, 0x5b, 0x18, 0xe3, 0x31, 0x43, 0x6e, 0xe5, 0xef, 0x12, 0x9c, 0x1c, 0xc3, 0x83, - 0x5e, 0x86, 0x29, 0xe2, 0x92, 0xcf, 0x46, 0x6f, 0x6d, 0xcc, 0x23, 0x82, 0xdd, 0xfd, 0xed, 0x2b, - 0xf4, 0x20, 0x3a, 0xc0, 0x3f, 0x4c, 0xca, 0x85, 0xde, 0x82, 0x59, 0xb5, 0xdd, 0x66, 0x7a, 0x49, - 0x26, 0xa6, 0x97, 0x8c, 0x79, 0xe2, 0xe5, 0x90, 0x9e, 0xea, 0x25, 0xd4, 0x39, 0xb4, 0xdd, 0x76, - 0x58, 0xb8, 0x41, 0xd4, 0xde, 0xea, 0x7f, 0xc1, 0x42, 0x9c, 0xf8, 0x48, 0x7a, 0xc9, 0xcf, 0x25, - 0x90, 0xe3, 0x7d, 0xf8, 0x76, 0xa0, 0x11, 0x46, 0x0d, 0xf3, 0x5d, 0x26, 0xd5, 0x4f, 0x33, 0xf0, - 0xf0, 0xc8, 0x2f, 0x8c, 0x9e, 0x82, 0x69, 0xb5, 0xdf, 0xd7, 0x4b, 0x6c, 0x56, 0x31, 0x81, 0x87, - 0x5c, 0xf7, 0xc6, 0xd4, 0x36, 0x4a, 0x84, 0xae, 0xc2, 0x0c, 0x99, 0x99, 0x98, 0x21, 0x13, 0x21, - 0x55, 0xd1, 0xdb, 0x90, 0x04, 0x52, 0x15, 0x27, 0x44, 0x65, 0x58, 0x60, 0x51, 0xd2, 0xa6, 0xbb, - 0xe7, 0x7e, 0x18, 0x42, 0xa6, 0x12, 0x54, 0x57, 0x7e, 0x87, 0xec, 0x0c, 0x68, 0x9d, 0x18, 0x27, - 0x1c, 0xe7, 0x42, 0x55, 0x90, 0x49, 0x9b, 0x62, 0x4b, 0x14, 0x2e, 0x8b, 0xc4, 0xad, 0xd3, 0x4e, - 0x8c, 0x69, 0x2b, 0xc5, 0x19, 0x0e, 0x97, 0xea, 0xfb, 0x9d, 0x3d, 0xef, 0xc0, 0xf5, 0x82, 0x6f, - 0x6f, 0xb8, 0xa2, 0x67, 0x1c, 0x6a, 0xb8, 0x7e, 0x96, 0xa3, 0x8b, 0x39, 0xc9, 0x86, 0x25, 0x1a, - 0x01, 0x21, 0x91, 0x48, 0x34, 0x24, 0xeb, 0x25, 0x8d, 0x03, 0x2e, 0xc1, 0x71, 0x1a, 0x9f, 0xcd, - 0x57, 0xc6, 0xe9, 0x91, 0x5d, 0xa0, 0x34, 0xdb, 0x57, 0xa8, 0xf8, 0x42, 0x63, 0x03, 0x7c, 0x93, - 0xb3, 0xa2, 0x6d, 0xc8, 0x17, 0xbb, 0x6e, 0xcb, 0x1b, 0xf6, 0xed, 0xc3, 0x99, 0x01, 0x57, 0xd8, - 0xbb, 0xcc, 0xed, 0x52, 0x36, 0x62, 0x3e, 0x24, 0x3b, 0xb9, 0xd8, 0x10, 0xb2, 0x43, 0x77, 0xe1, - 0x1c, 0xb9, 0x72, 0x7c, 0x66, 0xc2, 0xf7, 0x49, 0x16, 0x12, 0xbe, 0xb8, 0x2f, 0x3c, 0xf3, 0x27, - 0x76, 0x60, 0xa1, 0xda, 0xf2, 0x03, 0x7b, 0xd0, 0xf2, 0x7c, 0x82, 0xeb, 0x74, 0x08, 0xdc, 0x0b, - 0x9e, 0x1f, 0x97, 0x5e, 0x45, 0x06, 0x21, 0x2b, 0xbd, 0x8a, 0x8c, 0x37, 0x87, 0xe5, 0xa5, 0x72, - 0xc7, 0x6b, 0x75, 0x3b, 0x1f, 0xf1, 0xa8, 0x0a, 0x2a, 0x2f, 0xdd, 0xe0, 0x85, 0x66, 0x54, 0xaf, - 0xbc, 0x9d, 0x1a, 0x37, 0xda, 0xcb, 0x3c, 0x1c, 0x67, 0x31, 0x77, 0x34, 0x06, 0xad, 0xa1, 0x19, - 0x25, 0xdd, 0xd8, 0x94, 0x25, 0xb4, 0x00, 0xd0, 0x30, 0xeb, 0x45, 0xcd, 0xb2, 0xf0, 0xef, 0x0c, - 0xfe, 0xcd, 0x02, 0xd4, 0xca, 0xcd, 0xaa, 0x9c, 0x15, 0x62, 0xd4, 0x72, 0xca, 0x17, 0x12, 0x9c, - 0x18, 0x3d, 0x94, 0xc8, 0x06, 0x12, 0xa5, 0xc8, 0x0c, 0xc2, 0xcf, 0x4f, 0x1c, 0xf7, 0x91, 0xc5, - 0xc9, 0x68, 0xc7, 0x80, 0x46, 0xd1, 0x65, 0xb8, 0xd5, 0x27, 0xca, 0xec, 0xda, 0x69, 0x2b, 0x45, - 0x58, 0x19, 0xd7, 0x46, 0xfc, 0x55, 0x17, 0x21, 0xaf, 0x36, 0x1a, 0x55, 0xbd, 0xa8, 0xda, 0x7a, - 0xdd, 0x90, 0x25, 0x34, 0x0b, 0x53, 0x9b, 0x66, 0xbd, 0xd9, 0x90, 0x33, 0xca, 0xa7, 0x12, 0xcc, - 0xeb, 0x5e, 0xe0, 0xee, 0x51, 0x2f, 0xd5, 0xfb, 0x5d, 0x7c, 0x2f, 0xc5, 0x16, 0xdf, 0x4a, 0x18, - 0xcf, 0x1b, 0x3e, 0xe0, 0x50, 0x2b, 0xef, 0x77, 0x12, 0x2c, 0xa5, 0x78, 0x90, 0x05, 0xc7, 0xd5, - 0x1d, 0xab, 0xae, 0x97, 0x8a, 0xac, 0x67, 0x5c, 0x2a, 0x67, 0xa5, 0xe9, 0xa7, 0xd0, 0x18, 0x98, - 0x5b, 0xbe, 0xd3, 0xeb, 0xb4, 0x85, 0x7c, 0x52, 0x95, 0x63, 0x26, 0x6f, 0x89, 0x9c, 0x64, 0x1f, - 0x0d, 0x07, 0x2e, 0x69, 0x36, 0x13, 0xbb, 0xd1, 0x0c, 0xcb, 0xd3, 0x0d, 0x13, 0xa7, 0xcc, 0x16, - 0xae, 0x4f, 0x37, 0x1d, 0xb5, 0xb7, 0x31, 0x0f, 0x79, 0xa6, 0xb5, 0x10, 0x85, 0xe0, 0x13, 0x09, - 0x56, 0xc6, 0xf5, 0x15, 0x2b, 0x42, 0xf1, 0x80, 0xb8, 0x13, 0x21, 0x22, 0x70, 0x3c, 0x12, 0x8e, - 0x93, 0xa1, 0x57, 0x20, 0x4f, 0xd3, 0x65, 0x5b, 0x57, 0x9b, 0xa6, 0xce, 0x26, 0xc8, 0xe9, 0xbf, - 0x7e, 0x7d, 0xe6, 0x24, 0x4d, 0xae, 0xed, 0xf8, 0x57, 0x9d, 0xe1, 0xa0, 0x13, 0x43, 0x4f, 0x15, - 0x39, 0x94, 0x8f, 0x25, 0x58, 0x1d, 0xff, 0x92, 0xf8, 0x94, 0xb1, 0xb1, 0x6c, 0x1e, 0xc5, 0x14, - 0x91, 0x53, 0x86, 0xc8, 0xeb, 0x89, 0xa0, 0xa2, 0x90, 0x10, 0x33, 0x85, 0x99, 0x1a, 0x33, 0xa9, - 0x04, 0x6d, 0x71, 0x26, 0x4e, 0xa8, 0xfc, 0x2d, 0x03, 0x27, 0xf0, 0x04, 0xea, 0xba, 0xbe, 0xaf, - 0x0e, 0x83, 0x7d, 0xd7, 0x0b, 0x98, 0x48, 0x85, 0x5e, 0x80, 0xe9, 0xfd, 0xa3, 0xdd, 0x06, 0x52, - 0x72, 0x84, 0x80, 0x6c, 0xca, 0xdc, 0xa9, 0x13, 0xff, 0x8f, 0x1e, 0x05, 0x21, 0x21, 0x1e, 0xd9, - 0x53, 0xe7, 0x36, 0x32, 0x2b, 0x92, 0x39, 0xdb, 0x0f, 0x53, 0xe3, 0xbd, 0x08, 0x53, 0xe4, 0x06, - 0x80, 0x6d, 0x8f, 0x5c, 0xac, 0x1d, 0xdd, 0x3b, 0x72, 0x3f, 0x60, 0x52, 0x06, 0xf4, 0x34, 0x40, - 0x84, 0x3e, 0xcb, 0xf6, 0x3f, 0xae, 0x4a, 0x87, 0x00, 0xb4, 0xe6, 0xec, 0xc1, 0x8d, 0x16, 0x83, - 0x74, 0x2d, 0xc0, 0x12, 0xff, 0x2c, 0x7d, 0x0e, 0x75, 0xc3, 0x4c, 0x54, 0x8b, 0xb4, 0x42, 0xef, - 0x73, 0xb8, 0x9b, 0x73, 0xb0, 0xe0, 0xfb, 0xfb, 0x8e, 0xd0, 0x7b, 0x82, 0x78, 0x67, 0xce, 0xf9, - 0xfe, 0x7e, 0x94, 0xd7, 0xef, 0x1c, 0x2c, 0x04, 0x5d, 0x5f, 0xa4, 0x9a, 0xa1, 0x54, 0x41, 0xd7, - 0x0f, 0xa9, 0x94, 0x3f, 0x67, 0x60, 0x76, 0x07, 0x0b, 0x1e, 0x44, 0x9d, 0x9e, 0xac, 0x9e, 0x3f, - 0x0b, 0xf9, 0x6a, 0xaf, 0xc5, 0x6c, 0x01, 0x3e, 0x43, 0xee, 0x22, 0x81, 0x3a, 0xdd, 0x5e, 0x8b, - 0x9b, 0x15, 0x7c, 0x53, 0x24, 0xba, 0x4b, 0x90, 0xd1, 0x6b, 0x30, 0x4d, 0x6d, 0x33, 0xec, 0xe2, - 0x87, 0x8b, 0x9e, 0x61, 0x8f, 0x2e, 0xd3, 0x6a, 0xe1, 0xfa, 0x9a, 0xda, 0x77, 0x44, 0x39, 0x88, - 0x01, 0x77, 0x09, 0x97, 0x07, 0x53, 0x87, 0xbb, 0x3c, 0x10, 0x00, 0x4a, 0xa6, 0x0f, 0x03, 0x50, - 0xb2, 0x7a, 0x0d, 0xf2, 0x42, 0x7f, 0x8e, 0x24, 0x89, 0xfe, 0x7f, 0x06, 0xe6, 0xc9, 0x5b, 0x85, - 0x8e, 0x1a, 0xdf, 0xcd, 0xab, 0x90, 0x97, 0x62, 0x57, 0x21, 0x2b, 0xe2, 0x78, 0xd1, 0x37, 0x9b, - 0x70, 0x07, 0xf2, 0x1a, 0x2c, 0xa5, 0x08, 0xd1, 0x73, 0x30, 0x85, 0xbb, 0xcf, 0x55, 0x47, 0x39, - 0x39, 0x03, 0x22, 0x30, 0x3b, 0xfc, 0xe2, 0xbe, 0x49, 0xa9, 0x95, 0x7f, 0x48, 0x30, 0xc7, 0xa0, - 0x8d, 0xbd, 0x1b, 0xbd, 0xbb, 0x7e, 0xce, 0x0b, 0xc9, 0xcf, 0x49, 0x43, 0x66, 0xd9, 0xe7, 0xfc, - 0x57, 0x7f, 0xc4, 0x6b, 0xb1, 0x8f, 0x78, 0x32, 0x84, 0xb6, 0xe1, 0xaf, 0x33, 0xe1, 0x1b, 0xfe, - 0x96, 0x80, 0xbd, 0xc5, 0x09, 0xd1, 0xbb, 0x30, 0x6b, 0xb8, 0xb7, 0x62, 0x1a, 0xd8, 0x85, 0x31, - 0x8d, 0x5e, 0x0e, 0x09, 0xe9, 0x9a, 0x22, 0x87, 0x97, 0xe7, 0xde, 0x72, 0x52, 0x66, 0xa1, 0xa8, - 0x49, 0xac, 0x84, 0xc5, 0xd9, 0x8e, 0x32, 0xf5, 0x59, 0x60, 0x06, 0x89, 0x02, 0xff, 0x75, 0x0e, - 0x20, 0xf2, 0x69, 0xc7, 0x0b, 0x30, 0x66, 0x11, 0xe7, 0x77, 0xd1, 0xa4, 0x48, 0x9c, 0xe3, 0xdc, - 0x50, 0x7e, 0x81, 0x5d, 0xb2, 0x66, 0xc6, 0x43, 0x0f, 0x91, 0xeb, 0xd6, 0x22, 0xf3, 0x19, 0x6f, - 0xbb, 0xdd, 0x16, 0xdd, 0xdb, 0xb3, 0x1b, 0xe7, 0x08, 0xd2, 0x5c, 0x58, 0x3a, 0x26, 0x47, 0x1d, - 0xf1, 0x2c, 0x2f, 0x61, 0x82, 0x54, 0x9c, 0x48, 0xee, 0xde, 0xe3, 0x44, 0xa6, 0xee, 0x21, 0x4e, - 0x64, 0xfa, 0x90, 0x71, 0x22, 0x0d, 0x98, 0xed, 0x78, 0x37, 0x5d, 0x2f, 0xe8, 0x0d, 0x6e, 0x13, - 0xab, 0x77, 0x74, 0x35, 0x86, 0x3f, 0xb5, 0xce, 0xeb, 0xe8, 0x78, 0x93, 0x03, 0x38, 0xa4, 0x17, - 0x87, 0x3b, 0x2c, 0x44, 0xff, 0x01, 0x91, 0x15, 0x85, 0xe1, 0x91, 0x8f, 0x3f, 0xb7, 0x77, 0xb9, - 0x91, 0xe5, 0x55, 0x88, 0x1b, 0x53, 0x58, 0x94, 0x25, 0xcd, 0xa7, 0x2a, 0x56, 0x88, 0x68, 0x5b, - 0xbb, 0x82, 0xbd, 0x85, 0xb9, 0xd1, 0x7e, 0x93, 0x01, 0x94, 0xee, 0x38, 0x7a, 0x09, 0xf2, 0x74, - 0xeb, 0x77, 0x06, 0xfe, 0x07, 0x2c, 0xb8, 0x81, 0x46, 0xf9, 0x0b, 0xc5, 0x62, 0x94, 0x3f, 0x2d, - 0x36, 0xfd, 0x0f, 0xba, 0xe8, 0x1d, 0x78, 0x88, 0x0c, 0x7c, 0xdf, 0x1d, 0x74, 0x7a, 0x6d, 0x87, - 0x40, 0xb2, 0xb5, 0xba, 0x2c, 0xd3, 0xcd, 0x53, 0x24, 0x25, 0x5b, 0xba, 0x7a, 0xcc, 0x04, 0x21, - 0x31, 0x04, 0x0d, 0x42, 0xd9, 0xa0, 0x84, 0xc8, 0x06, 0x59, 0xe4, 0xbf, 0x31, 0xec, 0x76, 0xd9, - 0x9c, 0x2b, 0x60, 0x75, 0x3a, 0x59, 0x37, 0xa6, 0xe1, 0x85, 0xa8, 0xe1, 0xf2, 0xb0, 0xdb, 0x45, - 0x2f, 0x00, 0xf4, 0x3c, 0xe7, 0xa0, 0xe3, 0xfb, 0xd4, 0x30, 0x12, 0xc6, 0xff, 0x44, 0xa5, 0xe2, - 0xf0, 0xf5, 0xbc, 0x1a, 0x2d, 0xc4, 0xc3, 0xd7, 0x6f, 0xed, 0xb9, 0x24, 0x6a, 0x96, 0x3a, 0xc1, - 0x30, 0xec, 0x6a, 0x5e, 0x18, 0x9f, 0x46, 0x7b, 0xae, 0xd5, 0xf9, 0x88, 0xfb, 0x30, 0xbf, 0x09, - 0x4b, 0xcc, 0xfd, 0x74, 0xa7, 0x13, 0xec, 0x33, 0x39, 0xfe, 0x7e, 0x94, 0x00, 0x41, 0x90, 0xff, - 0x43, 0x0e, 0x40, 0xdd, 0xb1, 0x38, 0x20, 0xc5, 0x25, 0x98, 0xc2, 0xda, 0x09, 0xbf, 0xe5, 0x20, - 0x77, 0xc4, 0xa4, 0x5d, 0xf1, 0x8e, 0x98, 0x50, 0xe0, 0x7d, 0xc2, 0x74, 0xf7, 0xc8, 0x45, 0x5b, - 0x26, 0xba, 0x12, 0x19, 0xd0, 0xa2, 0x98, 0x34, 0x4c, 0x8b, 0x50, 0x15, 0x20, 0x82, 0x88, 0x60, - 0xfa, 0xf2, 0x52, 0x14, 0x6b, 0xcd, 0x2a, 0x18, 0x28, 0x71, 0x04, 0x33, 0x21, 0x4e, 0x9f, 0x88, - 0x0c, 0x6d, 0x41, 0xce, 0x6e, 0x85, 0xd1, 0x2d, 0x63, 0x80, 0x33, 0xce, 0xb2, 0x4c, 0x44, 0x11, - 0x78, 0xc6, 0x42, 0xd0, 0x8a, 0x25, 0x6c, 0x23, 0x8d, 0x20, 0x0d, 0xa6, 0x59, 0x96, 0xc9, 0x31, - 0x80, 0x4b, 0x2c, 0xc9, 0x24, 0x83, 0x59, 0x24, 0x85, 0xa2, 0xb4, 0xc3, 0xf2, 0x49, 0x3e, 0x0b, - 0x59, 0xcb, 0xaa, 0xb1, 0x70, 0xd1, 0xf9, 0x48, 0xf7, 0xb1, 0xac, 0x1a, 0x4f, 0xca, 0x7b, 0x20, - 0xb0, 0x61, 0x62, 0xf4, 0x9f, 0x90, 0x17, 0x04, 0x7b, 0x16, 0x68, 0x4d, 0xbe, 0x41, 0x27, 0x2a, - 0x16, 0xb7, 0x33, 0x81, 0x1a, 0x55, 0x41, 0xde, 0x1a, 0xbe, 0xe7, 0xaa, 0xfd, 0x3e, 0x89, 0xcc, - 0xb8, 0xe9, 0x0e, 0xa8, 0x40, 0x39, 0x13, 0x21, 0x14, 0x3a, 0xad, 0x7e, 0xdf, 0x69, 0xf3, 0x5a, - 0xf1, 0xa6, 0x27, 0xc9, 0x89, 0x1a, 0xb0, 0x64, 0xb9, 0xc1, 0xb0, 0x4f, 0xdd, 0x3a, 0xca, 0xbd, - 0x01, 0x56, 0x75, 0xe8, 0x86, 0x41, 0xc0, 0xdc, 0x7c, 0x5c, 0xc9, 0x7d, 0x69, 0x6e, 0xf4, 0x06, - 0x09, 0xb5, 0x27, 0xcd, 0xac, 0xb8, 0xe2, 0x90, 0xe3, 0xf3, 0x3e, 0xae, 0x40, 0x91, 0xf3, 0x9e, - 0x2b, 0x50, 0x91, 0xda, 0xf4, 0xf4, 0x08, 0xe8, 0x10, 0x62, 0x96, 0x13, 0xa0, 0x43, 0x62, 0x80, - 0x21, 0x9f, 0xe5, 0x04, 0xf4, 0x2a, 0x36, 0x16, 0x2f, 0x03, 0xbc, 0xd6, 0xeb, 0x78, 0x35, 0x37, - 0xd8, 0xef, 0xb5, 0x05, 0x04, 0x93, 0xfc, 0xff, 0xf4, 0x3a, 0x9e, 0x73, 0x40, 0x8a, 0xbf, 0xf9, - 0xfa, 0x8c, 0x40, 0x64, 0x0a, 0xff, 0xa3, 0x27, 0x61, 0x16, 0xff, 0xb2, 0x23, 0xe7, 0x14, 0x7a, - 0x21, 0x4a, 0xb8, 0x59, 0x72, 0xef, 0x90, 0x00, 0x5d, 0x23, 0xa8, 0xe6, 0x9d, 0x7e, 0x20, 0x88, - 0xd5, 0x1c, 0xc2, 0xbc, 0xd3, 0x0f, 0x92, 0x80, 0x84, 0x02, 0x31, 0xaa, 0x84, 0x5d, 0xe7, 0xb8, - 0xf8, 0x0c, 0x3c, 0x9d, 0xdc, 0xfa, 0xb1, 0xb9, 0xe6, 0x70, 0x24, 0x34, 0x31, 0x83, 0x59, 0x82, - 0x8d, 0x74, 0xc2, 0xaa, 0x94, 0xa8, 0x99, 0x86, 0x9d, 0x6e, 0xb4, 0x13, 0xfe, 0x7e, 0xdb, 0xd9, - 0x25, 0xc5, 0xb1, 0x4e, 0x84, 0xc4, 0x68, 0x03, 0x16, 0xa9, 0xf6, 0x11, 0xe6, 0xd7, 0x61, 0x27, - 0x1d, 0xd9, 0xdb, 0xa2, 0x04, 0x3c, 0xe2, 0xe3, 0x13, 0x0c, 0xa8, 0x0c, 0x53, 0x44, 0x55, 0x65, - 0xce, 0xe5, 0xa7, 0x44, 0x1d, 0x3d, 0xb9, 0x8e, 0xc8, 0xbe, 0x42, 0xb4, 0x73, 0x71, 0x5f, 0x21, - 0xa4, 0xe8, 0x0d, 0x00, 0xcd, 0x1b, 0xf4, 0xba, 0x5d, 0x82, 0xd5, 0x37, 0x43, 0x94, 0xbc, 0xd3, - 0xf1, 0xf5, 0x48, 0x5a, 0x89, 0x88, 0x18, 0xae, 0x0c, 0xf9, 0xed, 0x24, 0x10, 0xfd, 0x84, 0xb6, - 0x14, 0x1d, 0xa6, 0xe9, 0x62, 0x24, 0xb8, 0x97, 0x0c, 0xc9, 0x5b, 0x40, 0x4d, 0xa4, 0xb8, 0x97, - 0xac, 0x3c, 0x8d, 0x7b, 0x29, 0x30, 0x28, 0x5b, 0xb0, 0x3c, 0xea, 0xc5, 0x62, 0xca, 0xb5, 0x74, - 0x58, 0xe5, 0xfa, 0x57, 0x59, 0x98, 0x23, 0xad, 0xf1, 0x5d, 0x58, 0x85, 0x79, 0x6b, 0xf8, 0x5e, - 0x08, 0x0a, 0xc1, 0x77, 0x63, 0xd2, 0x3f, 0x5f, 0xac, 0x10, 0x0d, 0x68, 0x31, 0x0e, 0xa4, 0xc1, - 0x02, 0x3f, 0x09, 0x36, 0xb9, 0xc3, 0x7a, 0x08, 0x39, 0xc9, 0x81, 0x8d, 0xd2, 0xf9, 0xc5, 0x12, - 0x4c, 0xd1, 0x79, 0x90, 0x3d, 0xca, 0x79, 0x90, 0x3b, 0xd4, 0x79, 0xf0, 0x16, 0xcc, 0xf1, 0xa7, - 0x91, 0x9d, 0x7c, 0xea, 0xfe, 0x76, 0xf2, 0x58, 0x63, 0xa8, 0x1a, 0xee, 0xe8, 0xd3, 0x13, 0x77, - 0x74, 0x62, 0x95, 0xe4, 0xab, 0x2c, 0x95, 0x32, 0x98, 0xb5, 0x41, 0x12, 0xf0, 0x6c, 0x16, 0x1b, - 0xf7, 0x70, 0x4a, 0x3e, 0x07, 0xb3, 0xd5, 0x1e, 0x37, 0x48, 0x09, 0x96, 0x80, 0x2e, 0x2f, 0x14, - 0xc5, 0x85, 0x90, 0x32, 0x3c, 0xdd, 0xb2, 0x0f, 0xe2, 0x74, 0xbb, 0x06, 0xc0, 0x22, 0x21, 0xa2, - 0xc4, 0x19, 0x64, 0xc9, 0xf0, 0x98, 0xdf, 0xb8, 0x41, 0x42, 0x20, 0xc6, 0xbb, 0x13, 0x73, 0x5d, - 0x51, 0x77, 0x77, 0x7b, 0x43, 0x2f, 0x88, 0x65, 0x9a, 0x63, 0xe1, 0xff, 0xf8, 0x48, 0x20, 0x75, - 0xe2, 0xf6, 0x90, 0x60, 0x7b, 0xb0, 0x03, 0x82, 0x5e, 0x0f, 0x7d, 0xee, 0x26, 0x26, 0xde, 0x56, - 0x52, 0x5f, 0x68, 0xac, 0xa7, 0x9d, 0xf2, 0x85, 0x24, 0xe2, 0xfd, 0xde, 0xc3, 0x50, 0xbf, 0x08, - 0x10, 0x7a, 0x04, 0xf0, 0xb1, 0xa6, 0x9a, 0x5c, 0x58, 0x2a, 0x7e, 0xe5, 0x88, 0x56, 0x78, 0x9b, - 0xec, 0x83, 0x7a, 0x1b, 0x1b, 0xf2, 0xf5, 0xf7, 0x83, 0x56, 0xe4, 0x42, 0x02, 0x56, 0x28, 0xc9, - 0x92, 0x9d, 0x89, 0x27, 0x08, 0x8f, 0xe4, 0xe0, 0xb1, 0x09, 0xc2, 0x43, 0x46, 0xe5, 0x75, 0x58, - 0x14, 0x03, 0x13, 0x6f, 0x7b, 0xbb, 0xe8, 0xbf, 0x29, 0xfa, 0x98, 0x14, 0xd3, 0x71, 0x04, 0x22, - 0xbc, 0xe3, 0xde, 0xf6, 0x76, 0xa9, 0xfc, 0xd3, 0xba, 0x25, 0xf6, 0x95, 0x68, 0x9f, 0x5f, 0x49, - 0x80, 0xd2, 0xe4, 0xe2, 0x6e, 0x22, 0xfd, 0x1b, 0xa4, 0xcb, 0x84, 0x54, 0x96, 0x3b, 0x8a, 0x54, - 0x56, 0xf8, 0x89, 0x04, 0x8b, 0xba, 0x5a, 0x63, 0xe0, 0xbc, 0xd4, 0xb2, 0xf1, 0x28, 0x9c, 0xd6, - 0xd5, 0x9a, 0xd3, 0xa8, 0x57, 0xf5, 0xe2, 0x75, 0x67, 0x24, 0xe6, 0xde, 0x69, 0x78, 0x24, 0x4d, - 0x12, 0x59, 0x40, 0xd6, 0x60, 0x25, 0x5d, 0xcd, 0x71, 0xf9, 0x46, 0x33, 0x73, 0x08, 0xbf, 0x6c, - 0xe1, 0x15, 0x58, 0xe4, 0x18, 0x74, 0x76, 0xd5, 0x22, 0x28, 0xb7, 0x8b, 0x90, 0xdf, 0xd6, 0x4c, - 0xbd, 0x7c, 0xdd, 0x29, 0x37, 0xab, 0x55, 0xf9, 0x18, 0x9a, 0x87, 0x59, 0x56, 0x50, 0x54, 0x65, - 0x09, 0xcd, 0xc1, 0x8c, 0x6e, 0x58, 0x5a, 0xb1, 0x69, 0x6a, 0x72, 0xa6, 0xf0, 0x0a, 0x2c, 0x34, - 0x06, 0x9d, 0x9b, 0xad, 0xc0, 0xdd, 0x72, 0x6f, 0x13, 0x03, 0xc6, 0x71, 0xc8, 0x9a, 0xea, 0x8e, - 0x7c, 0x0c, 0x01, 0x4c, 0x37, 0xb6, 0x8a, 0xd6, 0x95, 0x2b, 0xb2, 0x84, 0xf2, 0x70, 0x7c, 0xb3, - 0xd8, 0x70, 0xb6, 0x6a, 0x96, 0x9c, 0xc1, 0x3f, 0xd4, 0x1d, 0x8b, 0xfc, 0xc8, 0x16, 0x9e, 0x81, - 0x25, 0x22, 0x2b, 0x54, 0x3b, 0x7e, 0xe0, 0x7a, 0xee, 0x80, 0xf4, 0x61, 0x0e, 0x66, 0x2c, 0x17, - 0x2f, 0xf2, 0xc0, 0xa5, 0x1d, 0xa8, 0x0d, 0xbb, 0x41, 0xa7, 0xdf, 0x75, 0x3f, 0x94, 0xa5, 0xc2, - 0x35, 0x58, 0x34, 0x7b, 0xc3, 0xa0, 0xe3, 0xed, 0x59, 0x01, 0xa6, 0xd8, 0xbb, 0x8d, 0x1e, 0x86, - 0xa5, 0xa6, 0xa1, 0xd6, 0x36, 0xf4, 0xcd, 0x66, 0xbd, 0x69, 0x39, 0x35, 0xd5, 0x2e, 0x56, 0xa8, - 0xf9, 0xa4, 0x56, 0xb7, 0x6c, 0xc7, 0xd4, 0x8a, 0x9a, 0x61, 0xcb, 0x52, 0xe1, 0x07, 0x12, 0x2c, - 0x34, 0x7d, 0xe6, 0xf2, 0xdb, 0x24, 0x81, 0x7b, 0x67, 0x61, 0xad, 0x69, 0x69, 0xa6, 0x63, 0xd7, - 0xb7, 0x34, 0xc3, 0x69, 0x5a, 0xea, 0x66, 0x12, 0xf0, 0xf1, 0x0c, 0x9c, 0x12, 0x28, 0x4c, 0xad, - 0x58, 0xdf, 0xd6, 0x4c, 0xa7, 0xa1, 0x5a, 0xd6, 0x4e, 0xdd, 0x2c, 0xc9, 0x12, 0x5a, 0x85, 0x13, - 0x23, 0x08, 0x6a, 0x65, 0x55, 0xce, 0xa4, 0xea, 0x0c, 0x6d, 0x47, 0xad, 0x3a, 0x1b, 0x75, 0x5b, - 0xce, 0x16, 0x6a, 0xf8, 0xa0, 0x23, 0x40, 0x67, 0x14, 0xd1, 0x7e, 0x06, 0x72, 0x46, 0xdd, 0xd0, - 0x92, 0x26, 0xae, 0x39, 0x98, 0x51, 0x1b, 0x0d, 0xb3, 0xbe, 0x4d, 0x06, 0x14, 0x60, 0xba, 0xa4, - 0x19, 0xb8, 0x67, 0x59, 0x5c, 0xd3, 0x30, 0xeb, 0xb5, 0xba, 0xad, 0x95, 0xe4, 0x5c, 0xc1, 0xe4, - 0x0b, 0x86, 0x37, 0xba, 0xdb, 0xa3, 0xf6, 0xa4, 0x92, 0x56, 0x56, 0x9b, 0x55, 0x9b, 0x7d, 0x90, - 0xeb, 0x8e, 0xa9, 0xbd, 0xde, 0xd4, 0x2c, 0xdb, 0x92, 0x25, 0x24, 0xc3, 0x9c, 0xa1, 0x69, 0x25, - 0xcb, 0x31, 0xb5, 0x6d, 0x5d, 0xdb, 0x91, 0x33, 0xb8, 0x4d, 0xfa, 0x3f, 0x7e, 0x42, 0xe1, 0x33, - 0x09, 0x10, 0x05, 0x89, 0xe3, 0xc8, 0xe3, 0x64, 0x7c, 0xd6, 0x61, 0xb5, 0x82, 0x3f, 0x2c, 0x79, - 0xb5, 0x5a, 0xbd, 0x94, 0xfc, 0x64, 0x27, 0x00, 0x25, 0xea, 0xeb, 0xe5, 0xb2, 0x2c, 0xa1, 0x53, - 0xf0, 0x50, 0xa2, 0xbc, 0x64, 0xd6, 0x1b, 0x72, 0x66, 0x35, 0x33, 0x23, 0xa1, 0x93, 0xa9, 0xca, - 0x2d, 0x4d, 0x6b, 0xc8, 0x59, 0x3c, 0x44, 0x89, 0x0a, 0x3e, 0x01, 0x29, 0x7b, 0xae, 0xf0, 0xb1, - 0x04, 0x27, 0x68, 0x37, 0xf9, 0x6c, 0x0e, 0xbb, 0xba, 0x06, 0x2b, 0x0c, 0xfa, 0x72, 0x54, 0x47, - 0x97, 0x41, 0x8e, 0xd5, 0xd2, 0x6e, 0x3e, 0x0c, 0x4b, 0xb1, 0x52, 0xd2, 0x8f, 0x0c, 0x5e, 0xab, - 0xb1, 0xe2, 0x0d, 0xcd, 0xb2, 0x1d, 0xad, 0x5c, 0xae, 0x9b, 0x36, 0xed, 0x48, 0xb6, 0xa0, 0xc0, - 0x52, 0xd1, 0x1d, 0x04, 0x58, 0x07, 0xf1, 0xfc, 0x4e, 0xcf, 0x23, 0x5d, 0x98, 0x87, 0x59, 0xed, - 0x0d, 0x5b, 0x33, 0x2c, 0xbd, 0x6e, 0xc8, 0xc7, 0x0a, 0x6b, 0x09, 0x1a, 0xbe, 0x6a, 0x2c, 0xab, - 0x22, 0x1f, 0x2b, 0xb4, 0x60, 0x9e, 0xbb, 0xd8, 0xd2, 0x59, 0xb1, 0x0e, 0xab, 0x7c, 0xae, 0x91, - 0xf5, 0x9b, 0x7c, 0x85, 0x15, 0x58, 0x4e, 0xd7, 0x6b, 0xb6, 0x2c, 0xe1, 0x51, 0x48, 0xd4, 0xe0, - 0xf2, 0x4c, 0xe1, 0x97, 0x12, 0xac, 0xb0, 0x1c, 0x9f, 0xcc, 0xb6, 0x41, 0xd1, 0xb6, 0x09, 0x1c, - 0x5d, 0x01, 0x2e, 0xd8, 0x66, 0xd3, 0xb2, 0xb5, 0x92, 0x53, 0xd2, 0xb6, 0xf5, 0xa2, 0x46, 0xa6, - 0x8b, 0x6e, 0x6a, 0x35, 0xcd, 0xb0, 0x13, 0x8f, 0x7e, 0x02, 0x1e, 0x9f, 0x40, 0x6b, 0xd4, 0x6d, - 0xfe, 0x1b, 0xaf, 0x92, 0xc7, 0xe1, 0xb1, 0x09, 0xc4, 0x21, 0x61, 0xa6, 0xf0, 0x36, 0xcc, 0xc5, - 0x32, 0x88, 0x9c, 0x84, 0x87, 0xc4, 0xdf, 0x0d, 0xd7, 0x6b, 0x77, 0xbc, 0x3d, 0xf9, 0x58, 0xb2, - 0xc2, 0x1c, 0x7a, 0x1e, 0xae, 0x20, 0x0b, 0x52, 0xac, 0xb0, 0xdd, 0xc1, 0x41, 0xc7, 0x6b, 0x05, - 0x6e, 0x5b, 0xce, 0x14, 0x2e, 0xc3, 0x7c, 0x0c, 0xb7, 0x10, 0x7f, 0xf9, 0x6a, 0x9d, 0xed, 0x57, - 0x35, 0xad, 0xa4, 0x37, 0x6b, 0xf2, 0x14, 0x5e, 0x8a, 0x15, 0x7d, 0xb3, 0x22, 0x43, 0xe1, 0x53, - 0x09, 0x4b, 0xcc, 0xe4, 0xfb, 0xd4, 0xca, 0x2a, 0x1f, 0x2b, 0x3c, 0x4f, 0x28, 0x1a, 0xaa, 0x66, - 0x59, 0xd4, 0x34, 0xbb, 0x06, 0x2b, 0xec, 0x87, 0xa3, 0x1a, 0x25, 0xa7, 0xa2, 0x9a, 0xa5, 0x1d, - 0xd5, 0xc4, 0x93, 0xe7, 0xba, 0x9c, 0x21, 0x2b, 0x42, 0x28, 0x71, 0xec, 0x7a, 0xb3, 0x58, 0x91, - 0xb3, 0x78, 0x02, 0xc6, 0xca, 0x1b, 0xba, 0x21, 0xe7, 0xc8, 0xfa, 0x4a, 0x51, 0x93, 0x66, 0x71, - 0xfd, 0x54, 0xe1, 0x8e, 0x04, 0x27, 0xad, 0xce, 0x9e, 0xd7, 0x0a, 0x86, 0x03, 0x57, 0xed, 0xee, - 0xf5, 0x06, 0x9d, 0x60, 0xff, 0xc0, 0x1a, 0x76, 0x02, 0x17, 0x5d, 0x82, 0xf3, 0x96, 0xbe, 0x69, - 0xa8, 0x36, 0x5e, 0x1f, 0x6a, 0x75, 0xb3, 0x6e, 0xea, 0x76, 0xa5, 0xe6, 0x58, 0x4d, 0x3d, 0x35, - 0x75, 0xce, 0xc1, 0xd9, 0xf1, 0xa4, 0x55, 0x6d, 0x53, 0x2d, 0x5e, 0x97, 0xa5, 0xc9, 0x0d, 0x6e, - 0xa8, 0x55, 0xd5, 0x28, 0x6a, 0x25, 0x67, 0xfb, 0x8a, 0x9c, 0x41, 0xe7, 0xe1, 0xd1, 0xf1, 0xa4, - 0x65, 0xbd, 0x61, 0x61, 0xb2, 0xec, 0xe4, 0xe7, 0x56, 0xac, 0x1a, 0xa6, 0xca, 0x15, 0x3a, 0x20, - 0x27, 0x23, 0xb2, 0x53, 0x8e, 0x00, 0x66, 0xd3, 0x30, 0xe8, 0x2e, 0xb9, 0x08, 0xf9, 0xba, 0x5d, - 0xd1, 0x4c, 0x06, 0xca, 0x4b, 0x50, 0x78, 0x9b, 0x86, 0xda, 0xb4, 0x2b, 0x75, 0x53, 0x7f, 0x93, - 0x6c, 0x97, 0x2b, 0xb0, 0x6c, 0x55, 0xd5, 0xe2, 0x16, 0x99, 0x99, 0xba, 0xe1, 0x14, 0x2b, 0xaa, - 0x61, 0x68, 0x55, 0x19, 0x0a, 0xbf, 0x90, 0xa8, 0x45, 0x7e, 0x54, 0xe8, 0x16, 0x7a, 0x12, 0x2e, - 0xd6, 0xb7, 0x6c, 0xd5, 0x69, 0x54, 0x9b, 0x9b, 0xba, 0xe1, 0x58, 0xd7, 0x8d, 0x22, 0x3f, 0x48, - 0x8b, 0xe9, 0x1d, 0xe5, 0x22, 0x9c, 0x9b, 0x48, 0x1d, 0xc1, 0xe7, 0x5e, 0x00, 0x65, 0x22, 0x25, - 0x7b, 0x91, 0xc2, 0x97, 0x12, 0x9c, 0x9a, 0x60, 0xc5, 0x44, 0x4f, 0xc1, 0xa5, 0x8a, 0xa6, 0x96, - 0xaa, 0x9a, 0x65, 0x39, 0xf8, 0x7d, 0x35, 0xc3, 0x66, 0x0e, 0x03, 0x23, 0xf7, 0x8b, 0x4b, 0x70, - 0x7e, 0x32, 0x79, 0x74, 0xf2, 0x5c, 0x84, 0x73, 0x93, 0x49, 0xd9, 0x49, 0x94, 0xc1, 0xbb, 0xc6, - 0x64, 0xca, 0xf0, 0x04, 0xcb, 0x16, 0x3e, 0x91, 0xe0, 0xc4, 0x68, 0x85, 0x1d, 0xf7, 0x4d, 0x37, - 0x2c, 0x5b, 0xad, 0x56, 0x9d, 0x86, 0x6a, 0xaa, 0x35, 0x47, 0x33, 0xcc, 0x7a, 0xb5, 0x3a, 0x6a, - 0xe7, 0x3e, 0x07, 0x67, 0xc7, 0x93, 0x5a, 0x45, 0x53, 0x6f, 0xe0, 0x2d, 0x50, 0x81, 0xf5, 0xf1, - 0x54, 0x9a, 0x5e, 0xd4, 0xe4, 0xcc, 0xc6, 0xcb, 0x9f, 0xff, 0x69, 0xfd, 0xd8, 0xe7, 0x77, 0xd6, - 0xa5, 0xaf, 0xee, 0xac, 0x4b, 0x7f, 0xbc, 0xb3, 0x2e, 0xbd, 0xf9, 0xc4, 0x11, 0x12, 0x94, 0xbf, - 0x37, 0x4d, 0x3c, 0x64, 0xae, 0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xd1, 0x22, 0xbc, 0xad, - 0x96, 0x01, 0x00, + 0xda, 0x6b, 0xd2, 0x60, 0x90, 0x62, 0xf8, 0xff, 0x53, 0x77, 0x35, 0xcf, 0x6d, 0x1b, 0x59, 0xde, + 0x20, 0x29, 0x99, 0x7a, 0xd4, 0x07, 0xd4, 0x51, 0x6c, 0x45, 0x96, 0x65, 0x07, 0xb1, 0x1d, 0x9b, + 0x49, 0x9c, 0x38, 0xde, 0x7c, 0x38, 0xbb, 0xd9, 0x2c, 0x44, 0x82, 0x22, 0x2c, 0x12, 0x64, 0x00, + 0x50, 0x8a, 0xf3, 0x85, 0x62, 0x44, 0x58, 0xe2, 0x86, 0x02, 0x19, 0x02, 0xb4, 0xe3, 0x5c, 0x76, + 0xf7, 0x92, 0x54, 0xed, 0x6e, 0xf6, 0x23, 0xb5, 0x87, 0xad, 0xad, 0xad, 0xda, 0x4b, 0x0e, 0xfb, + 0x3f, 0xcc, 0x3f, 0x90, 0xaa, 0x54, 0xaa, 0x72, 0x98, 0xd3, 0x4c, 0x55, 0x6a, 0xc6, 0x55, 0x33, + 0x87, 0x99, 0xe3, 0xd4, 0x5c, 0x72, 0x9a, 0xea, 0x2f, 0xa0, 0x01, 0x90, 0xb4, 0x14, 0x3b, 0x33, + 0x95, 0x93, 0xc4, 0xee, 0xf7, 0x1a, 0xfd, 0xdd, 0xaf, 0xfb, 0xbd, 0xf7, 0x7b, 0x29, 0x36, 0xbc, + 0xc3, 0xa4, 0x12, 0x93, 0x8b, 0xef, 0x0e, 0x97, 0x42, 0x26, 0x57, 0xf0, 0x18, 0xc0, 0x5e, 0x97, + 0x21, 0xdf, 0xe4, 0xca, 0x0f, 0xc1, 0x7e, 0x8d, 0x2b, 0x3a, 0xcc, 0x30, 0x57, 0xf9, 0x57, 0x89, + 0xdf, 0xea, 0x1f, 0xdc, 0x10, 0x21, 0x0c, 0x40, 0x67, 0x7a, 0x18, 0x80, 0xce, 0x0f, 0x0c, 0x03, + 0xa0, 0xfc, 0x3f, 0x83, 0xdd, 0xd4, 0x3b, 0xcd, 0x44, 0x64, 0xaa, 0x87, 0xb5, 0x43, 0xd4, 0x62, + 0xb3, 0xf3, 0x29, 0x21, 0x34, 0x49, 0xfa, 0x5b, 0x93, 0xcd, 0x11, 0x85, 0xa9, 0xfa, 0xdb, 0x0c, + 0xac, 0x4f, 0x63, 0x1f, 0x1b, 0x44, 0x4b, 0x3a, 0x5e, 0x10, 0xad, 0x2b, 0x90, 0xa7, 0x69, 0xf1, + 0xc8, 0xc4, 0x8c, 0x15, 0x77, 0x38, 0xcf, 0x46, 0x4f, 0xc1, 0xac, 0x5a, 0xb2, 0xa2, 0xd8, 0x09, + 0xc4, 0x1a, 0xa6, 0xbd, 0xe7, 0x13, 0x3b, 0x0b, 0x96, 0x85, 0xde, 0x4f, 0x87, 0x0b, 0x61, 0x41, + 0x13, 0xce, 0x08, 0x1d, 0x92, 0x42, 0xc4, 0x25, 0xf5, 0x8d, 0x10, 0x5c, 0x19, 0x28, 0xa2, 0x99, + 0x0e, 0x3d, 0xa2, 0xc0, 0x6c, 0x73, 0xe8, 0xfa, 0x6e, 0x20, 0x5a, 0xaa, 0x0c, 0x48, 0x8a, 0xc9, + 0x72, 0x98, 0x1d, 0x49, 0xfb, 0x1e, 0x75, 0x1b, 0x9c, 0x15, 0x5d, 0xb9, 0x89, 0xe1, 0x09, 0x4e, + 0x36, 0x05, 0x12, 0xe5, 0x33, 0x09, 0x56, 0xc6, 0x55, 0x0b, 0xad, 0x43, 0xce, 0x1b, 0x1b, 0xe8, + 0xc4, 0xa3, 0xce, 0x4b, 0x05, 0x12, 0x15, 0xf6, 0x76, 0x7f, 0x78, 0xd8, 0x0e, 0x44, 0xf3, 0x1c, + 0x21, 0xd9, 0x04, 0xfc, 0xa3, 0x42, 0xfe, 0x47, 0xe7, 0xf8, 0x66, 0x9b, 0x4d, 0x85, 0x46, 0x21, + 0x7f, 0x14, 0x15, 0x40, 0xef, 0x34, 0x1b, 0x03, 0x0a, 0xb0, 0x7a, 0x1d, 0x72, 0xb8, 0x5a, 0x89, + 0xc9, 0x88, 0xa7, 0x83, 0x5a, 0xaf, 0x31, 0x22, 0x5a, 0x2b, 0xbf, 0x7d, 0xd8, 0x33, 0x09, 0xb1, + 0xb2, 0x0b, 0x8b, 0x71, 0x0a, 0xa4, 0xc5, 0x21, 0xb9, 0x0a, 0x2f, 0xca, 0xac, 0xa4, 0xcd, 0x7e, + 0x9f, 0x9a, 0x88, 0x6e, 0x3e, 0xf1, 0x8b, 0xef, 0xce, 0x01, 0xfe, 0x49, 0x79, 0xc6, 0x41, 0x76, + 0x29, 0xff, 0x9e, 0x81, 0x95, 0xc8, 0x2b, 0x8d, 0x2f, 0x89, 0x9f, 0xac, 0x8b, 0x84, 0x1a, 0x33, + 0xe1, 0xe7, 0x12, 0x53, 0xba, 0x81, 0x53, 0x2c, 0x87, 0xb7, 0x60, 0x75, 0x12, 0x3d, 0x7a, 0x26, + 0x15, 0xb5, 0x9d, 0x41, 0x36, 0x84, 0xe1, 0xdd, 0x85, 0x20, 0xee, 0xdf, 0x48, 0xb0, 0xc6, 0x0c, + 0x1b, 0xeb, 0xed, 0xae, 0x17, 0xb8, 0x5e, 0xdb, 0xdb, 0x73, 0x1f, 0x8d, 0x8b, 0xcf, 0x56, 0x6c, + 0x5b, 0xba, 0x18, 0xb7, 0x5f, 0x4d, 0x7d, 0x6d, 0x72, 0x6b, 0xd1, 0x15, 0x02, 0xce, 0xb1, 0x47, + 0x27, 0x6f, 0x8e, 0xba, 0x54, 0x7a, 0x38, 0x41, 0x74, 0xa9, 0x24, 0x14, 0xca, 0x3f, 0xc0, 0xc6, + 0xf4, 0x0f, 0xa0, 0xf7, 0x60, 0x81, 0x00, 0xda, 0xb7, 0x06, 0xfb, 0xc3, 0x76, 0xc7, 0xe5, 0x6f, + 0x5a, 0xfc, 0x49, 0x51, 0xcc, 0xa3, 0x80, 0x24, 0xcc, 0xc5, 0x6f, 0x9f, 0x40, 0xe5, 0x33, 0xa6, + 0x98, 0xf5, 0xb0, 0x58, 0x9a, 0xf2, 0x8f, 0x12, 0xa0, 0x74, 0x19, 0xe8, 0x65, 0x98, 0x6f, 0xd9, + 0x25, 0x2b, 0x68, 0x0f, 0x83, 0x6a, 0x7f, 0x34, 0x64, 0x40, 0x1f, 0xd4, 0xe3, 0x2b, 0xd8, 0xc3, + 0x3b, 0xc3, 0x30, 0x70, 0x0e, 0xfa, 0xa3, 0xa1, 0x19, 0xa3, 0x23, 0xa8, 0xf9, 0xae, 0xfb, 0x61, + 0xa7, 0x7d, 0x2f, 0x8e, 0x9a, 0xcf, 0xd2, 0x62, 0xa8, 0xf9, 0x2c, 0x4d, 0xf9, 0x52, 0x82, 0x33, + 0xdc, 0xe2, 0xa1, 0x33, 0xa6, 0x2e, 0x25, 0xe2, 0xd7, 0x3c, 0xe4, 0x40, 0x67, 0xd3, 0x64, 0xd3, + 0x65, 0xee, 0xfa, 0x4f, 0x2a, 0x48, 0x84, 0x54, 0xca, 0x8b, 0xfe, 0x0e, 0x72, 0x56, 0xd0, 0x1f, + 0x1c, 0xc1, 0xf7, 0x5f, 0x0e, 0x47, 0x34, 0xe8, 0x0f, 0x48, 0x11, 0x84, 0x53, 0x71, 0x61, 0x45, + 0xac, 0x1c, 0xaf, 0x31, 0xaa, 0xc3, 0x49, 0x86, 0x04, 0x93, 0xd0, 0x0e, 0x4d, 0x69, 0xd3, 0xe6, + 0x12, 0x07, 0x18, 0x60, 0x40, 0x5b, 0x26, 0x2f, 0x43, 0xf9, 0x37, 0x09, 0x0a, 0x58, 0x78, 0x20, + 0xd7, 0xb1, 0x87, 0x9d, 0xd2, 0x71, 0x39, 0x90, 0x2b, 0x17, 0xc3, 0xe2, 0x8f, 0x74, 0xb8, 0xbe, + 0x04, 0x4b, 0x09, 0x06, 0xa4, 0x10, 0xd7, 0xd2, 0x5e, 0x77, 0xaf, 0x4d, 0x41, 0xb8, 0xa9, 0x66, + 0x2e, 0x96, 0xa6, 0xfc, 0xb3, 0x04, 0x2b, 0xf8, 0xf2, 0xae, 0x93, 0x77, 0x5b, 0x73, 0xd4, 0xe3, + 0xeb, 0x1d, 0x0b, 0x44, 0xdc, 0x74, 0x86, 0xba, 0xbd, 0x51, 0x81, 0x88, 0xa5, 0x99, 0x61, 0x2e, + 0xaa, 0x42, 0x9e, 0x9d, 0x2f, 0x3e, 0xc3, 0xc7, 0xda, 0x10, 0x5e, 0x05, 0xa2, 0x82, 0x19, 0x11, + 0x6e, 0x09, 0xd9, 0xc2, 0x18, 0x8f, 0x19, 0x72, 0x2b, 0x7f, 0x90, 0xe0, 0xf4, 0x04, 0x1e, 0xf4, + 0x3a, 0xcc, 0x10, 0x93, 0x7c, 0x36, 0x7a, 0xeb, 0x13, 0x3e, 0x11, 0xec, 0x1d, 0xec, 0x5c, 0xa3, + 0x07, 0xd1, 0x21, 0xfe, 0x61, 0x52, 0x2e, 0xf4, 0x0e, 0xcc, 0xa9, 0x9d, 0x0e, 0xbb, 0x97, 0x64, + 0x62, 0xf7, 0x92, 0x09, 0x5f, 0xbc, 0x1a, 0xd2, 0xd3, 0x7b, 0x09, 0x35, 0x0e, 0xed, 0x74, 0x1c, + 0xe6, 0x6e, 0x10, 0x95, 0xb7, 0xf6, 0x37, 0xb0, 0x18, 0x27, 0x3e, 0xd6, 0xbd, 0xe4, 0xbf, 0x25, + 0x90, 0xe3, 0x75, 0xf8, 0x71, 0xa0, 0x11, 0xc6, 0x0d, 0xf3, 0x03, 0x26, 0xd5, 0x7f, 0x66, 0xe0, + 0xf1, 0xb1, 0x3d, 0x8c, 0x9e, 0x83, 0x59, 0x75, 0x30, 0xd0, 0xcb, 0x6c, 0x56, 0x31, 0x81, 0x87, + 0x3c, 0xf7, 0xc6, 0xae, 0x6d, 0x94, 0x08, 0x5d, 0x87, 0x3c, 0x99, 0x99, 0x98, 0x21, 0x13, 0x21, + 0x55, 0xd1, 0xd7, 0x90, 0x04, 0x52, 0x15, 0x27, 0x44, 0x15, 0x58, 0x64, 0x5e, 0xd2, 0xa6, 0xbb, + 0xef, 0x7e, 0x1c, 0x42, 0xa6, 0x12, 0x54, 0x57, 0xfe, 0x86, 0xec, 0x0c, 0x69, 0x9e, 0xe8, 0x27, + 0x1c, 0xe7, 0x42, 0x35, 0x90, 0x49, 0x99, 0x62, 0x49, 0x14, 0x2e, 0x8b, 0xf8, 0xad, 0xd3, 0x4a, + 0x4c, 0x28, 0x2b, 0xc5, 0x19, 0x0e, 0x97, 0xea, 0xfb, 0xdd, 0x7d, 0xef, 0xd0, 0xf5, 0x82, 0x1f, + 0x6f, 0xb8, 0xa2, 0x6f, 0x1c, 0x69, 0xb8, 0xfe, 0x2b, 0x47, 0x17, 0x73, 0x92, 0x0d, 0x4b, 0x34, + 0x02, 0x42, 0x22, 0x91, 0x68, 0x48, 0xd4, 0x4b, 0xea, 0x07, 0x5c, 0x86, 0x93, 0xd4, 0x3f, 0x9b, + 0xaf, 0x8c, 0xb3, 0x63, 0xab, 0x40, 0x69, 0x76, 0xae, 0x51, 0xf1, 0x85, 0xfa, 0x06, 0xf8, 0x26, + 0x67, 0x45, 0x3b, 0x50, 0x28, 0xf5, 0xdc, 0xb6, 0x37, 0x1a, 0xd8, 0x47, 0x53, 0x03, 0xae, 0xb2, + 0xb6, 0xcc, 0xef, 0x51, 0x36, 0xa2, 0x3e, 0x24, 0x3b, 0xb9, 0x58, 0x10, 0xb2, 0x43, 0x73, 0xe1, + 0x1c, 0x79, 0x72, 0x7c, 0x61, 0x4a, 0xff, 0x24, 0x13, 0x09, 0x5f, 0xdc, 0x16, 0x9e, 0xd9, 0x13, + 0x3b, 0xb0, 0x58, 0x6b, 0xfb, 0x81, 0x3d, 0x6c, 0x7b, 0x3e, 0xc1, 0x75, 0x3a, 0x02, 0xee, 0x05, + 0x8f, 0x8f, 0x4b, 0x9f, 0x22, 0x83, 0x90, 0x95, 0x3e, 0x45, 0xc6, 0x8b, 0xc3, 0xf2, 0x52, 0xa5, + 0xeb, 0xb5, 0x7b, 0xdd, 0x4f, 0xb8, 0x57, 0x05, 0x95, 0x97, 0x6e, 0xf3, 0x44, 0x33, 0xca, 0x57, + 0xde, 0x4d, 0x8d, 0x1b, 0xad, 0x65, 0x01, 0x4e, 0x32, 0x9f, 0x3b, 0xea, 0x83, 0xd6, 0xd4, 0x8c, + 0xb2, 0x6e, 0x6c, 0xc9, 0x12, 0x5a, 0x04, 0x68, 0x9a, 0x8d, 0x92, 0x66, 0x59, 0xf8, 0x77, 0x06, + 0xff, 0x66, 0x0e, 0x6a, 0x95, 0x56, 0x4d, 0xce, 0x0a, 0x3e, 0x6a, 0x39, 0xe5, 0x6b, 0x09, 0x4e, + 0x8d, 0x1f, 0x4a, 0x64, 0x03, 0xf1, 0x52, 0x64, 0x0a, 0xe1, 0x97, 0xa7, 0x8e, 0xfb, 0xd8, 0xe4, + 0xa4, 0xb7, 0x63, 0x40, 0xbd, 0xe8, 0x32, 0x5c, 0xeb, 0x13, 0x45, 0x76, 0xed, 0x76, 0x94, 0x12, + 0xac, 0x4e, 0x2a, 0x23, 0xde, 0xd4, 0x25, 0x28, 0xa8, 0xcd, 0x66, 0x4d, 0x2f, 0xa9, 0xb6, 0xde, + 0x30, 0x64, 0x09, 0xcd, 0xc1, 0xcc, 0x96, 0xd9, 0x68, 0x35, 0xe5, 0x8c, 0xf2, 0x85, 0x04, 0x0b, + 0xba, 0x17, 0xb8, 0xfb, 0xd4, 0x4a, 0xf5, 0x61, 0x17, 0xdf, 0x6b, 0xb1, 0xc5, 0xb7, 0x1a, 0xfa, + 0xf3, 0x86, 0x1f, 0x38, 0xd2, 0xca, 0xfb, 0xb9, 0x04, 0xcb, 0x29, 0x1e, 0x64, 0xc1, 0x49, 0x75, + 0xd7, 0x6a, 0xe8, 0xe5, 0x12, 0xab, 0x19, 0x97, 0xca, 0x59, 0x6a, 0xfa, 0x2b, 0xd4, 0x07, 0xe6, + 0xae, 0xef, 0xf4, 0xbb, 0x1d, 0x21, 0x9e, 0x54, 0xf5, 0x84, 0xc9, 0x4b, 0x22, 0x27, 0xd9, 0x27, + 0xa3, 0xa1, 0x4b, 0x8a, 0xcd, 0xc4, 0x5e, 0x34, 0xc3, 0xf4, 0x74, 0xc1, 0xc4, 0x28, 0xb3, 0x8d, + 0xf3, 0xd3, 0x45, 0x47, 0xe5, 0x6d, 0x2e, 0x40, 0x81, 0xdd, 0x5a, 0xc8, 0x85, 0xe0, 0x73, 0x09, + 0x56, 0x27, 0xd5, 0x15, 0x5f, 0x84, 0xe2, 0x0e, 0x71, 0xa7, 0x42, 0x44, 0xe0, 0xb8, 0x27, 0x1c, + 0x27, 0x43, 0x6f, 0x40, 0x81, 0x86, 0xcb, 0xb6, 0xae, 0xb7, 0x4c, 0x9d, 0x4d, 0x90, 0xb3, 0xbf, + 0xfb, 0xee, 0xdc, 0x69, 0x1a, 0x5c, 0xdb, 0xf1, 0xaf, 0x3b, 0xa3, 0x61, 0x37, 0x86, 0x9e, 0x2a, + 0x72, 0x28, 0x9f, 0x4a, 0xb0, 0x36, 0xb9, 0x91, 0xf8, 0x94, 0xb1, 0xb1, 0x6c, 0x1e, 0xf9, 0x14, + 0x91, 0x53, 0x86, 0xc8, 0xeb, 0x09, 0xa7, 0xa2, 0x90, 0x10, 0x33, 0x85, 0x91, 0x1a, 0x33, 0xa9, + 0x00, 0x6d, 0x71, 0x26, 0x4e, 0xa8, 0xfc, 0x3e, 0x03, 0xa7, 0xf0, 0x04, 0xea, 0xb9, 0xbe, 0xaf, + 0x8e, 0x82, 0x03, 0xd7, 0x0b, 0x98, 0x48, 0x85, 0x5e, 0x81, 0xd9, 0x83, 0xe3, 0xbd, 0x06, 0x52, + 0x72, 0x84, 0x80, 0x6c, 0xca, 0xdc, 0xa8, 0x13, 0xff, 0x8f, 0x9e, 0x04, 0x21, 0x20, 0x1e, 0xd9, + 0x53, 0xe7, 0x37, 0x33, 0xab, 0x92, 0x39, 0x37, 0x08, 0x43, 0xe3, 0xbd, 0x0a, 0x33, 0xe4, 0x05, + 0x80, 0x6d, 0x8f, 0x5c, 0xac, 0x1d, 0x5f, 0x3b, 0xf2, 0x3e, 0x60, 0x52, 0x06, 0xf4, 0x3c, 0x40, + 0x84, 0x3e, 0xcb, 0xf6, 0x3f, 0x7e, 0x95, 0x0e, 0x01, 0x68, 0xcd, 0xb9, 0xc3, 0xdb, 0x6d, 0x06, + 0xe9, 0x5a, 0x84, 0x65, 0xde, 0x2d, 0x03, 0x0e, 0x75, 0xc3, 0x54, 0x54, 0x4b, 0x34, 0x43, 0x1f, + 0x70, 0xb8, 0x9b, 0x0b, 0xb0, 0xe8, 0xfb, 0x07, 0x8e, 0x50, 0x7b, 0x82, 0x78, 0x67, 0xce, 0xfb, + 0xfe, 0x41, 0x14, 0xd7, 0xef, 0x02, 0x2c, 0x06, 0x3d, 0x5f, 0xa4, 0xca, 0x53, 0xaa, 0xa0, 0xe7, + 0x87, 0x54, 0xca, 0x6f, 0x32, 0x30, 0xb7, 0x8b, 0x05, 0x0f, 0x72, 0x9d, 0x9e, 0x7e, 0x3d, 0x7f, + 0x11, 0x0a, 0xb5, 0x7e, 0x9b, 0xe9, 0x02, 0x7c, 0x86, 0xdc, 0x45, 0x1c, 0x75, 0x7a, 0xfd, 0x36, + 0x57, 0x2b, 0xf8, 0xa6, 0x48, 0xf4, 0x00, 0x27, 0xa3, 0x9b, 0x30, 0x4b, 0x75, 0x33, 0xec, 0xe1, + 0x87, 0x8b, 0x9e, 0x61, 0x8d, 0xae, 0xd2, 0x6c, 0xe1, 0xf9, 0x9a, 0xea, 0x77, 0x44, 0x39, 0x88, + 0x01, 0x77, 0x09, 0x8f, 0x07, 0x33, 0x47, 0x7b, 0x3c, 0x10, 0x00, 0x4a, 0x66, 0x8f, 0x02, 0x50, + 0xb2, 0x76, 0x03, 0x0a, 0x42, 0x7d, 0x8e, 0x25, 0x89, 0xfe, 0x53, 0x06, 0x16, 0x48, 0xab, 0x42, + 0x43, 0x8d, 0x9f, 0xe6, 0x53, 0xc8, 0x6b, 0xb1, 0xa7, 0x90, 0x55, 0x71, 0xbc, 0x68, 0xcb, 0xa6, + 0xbc, 0x81, 0xdc, 0x84, 0xe5, 0x14, 0x21, 0x7a, 0x09, 0x66, 0x70, 0xf5, 0xf9, 0xd5, 0x51, 0x4e, + 0xce, 0x80, 0x08, 0xcc, 0x0e, 0x37, 0xdc, 0x37, 0x29, 0xb5, 0xf2, 0x47, 0x09, 0xe6, 0x19, 0xb4, + 0xb1, 0x77, 0xbb, 0xff, 0xc0, 0xee, 0xbc, 0x94, 0xec, 0x4e, 0xea, 0x32, 0xcb, 0xba, 0xf3, 0xcf, + 0xdd, 0x89, 0x37, 0x62, 0x9d, 0x78, 0x3a, 0x84, 0xb6, 0xe1, 0xcd, 0x99, 0xd2, 0x87, 0x3f, 0x23, + 0x60, 0x6f, 0x71, 0x42, 0xf4, 0x3e, 0xcc, 0x19, 0xee, 0xdd, 0xd8, 0x0d, 0xec, 0xd2, 0x84, 0x42, + 0xaf, 0x86, 0x84, 0x74, 0x4d, 0x91, 0xc3, 0xcb, 0x73, 0xef, 0x3a, 0x29, 0xb5, 0x50, 0x54, 0x24, + 0xbe, 0x84, 0xc5, 0xd9, 0x8e, 0x33, 0xf5, 0x99, 0x63, 0x06, 0xf1, 0x02, 0xff, 0x2c, 0x0b, 0x10, + 0xd9, 0xb4, 0xe3, 0x05, 0x18, 0xd3, 0x88, 0xf3, 0xb7, 0x68, 0x92, 0x24, 0xce, 0x71, 0xae, 0x28, + 0xbf, 0xc4, 0x1e, 0x59, 0x33, 0x93, 0xa1, 0x87, 0xc8, 0x73, 0x6b, 0x89, 0xd9, 0x8c, 0x77, 0xdc, + 0x5e, 0x9b, 0xee, 0xed, 0xd9, 0xcd, 0x0b, 0x04, 0x69, 0x2e, 0x4c, 0x9d, 0x10, 0xa3, 0x8e, 0x58, + 0x96, 0x97, 0x31, 0x41, 0xca, 0x4f, 0x24, 0x77, 0x3c, 0x3f, 0x91, 0x26, 0xcc, 0x75, 0xbd, 0x3b, + 0xae, 0x17, 0xf4, 0x87, 0xf7, 0x88, 0x36, 0x3a, 0x7a, 0xb2, 0xc2, 0x5d, 0xa0, 0xf3, 0x3c, 0x3a, + 0x0e, 0xe4, 0x60, 0x0c, 0xe9, 0xc5, 0x61, 0x08, 0x13, 0x43, 0x3f, 0x97, 0x19, 0x79, 0xf6, 0x66, + 0x2e, 0x3f, 0x2b, 0x9f, 0xbc, 0x99, 0xcb, 0xe7, 0xe5, 0xb9, 0x9b, 0xb9, 0xfc, 0x9c, 0x0c, 0xa6, + 0xa0, 0x7a, 0x09, 0x55, 0x2b, 0x82, 0x36, 0x24, 0xae, 0xe9, 0x50, 0xbe, 0xcf, 0x00, 0x4a, 0x57, + 0x03, 0xbd, 0x06, 0x05, 0xba, 0xc1, 0x3a, 0x43, 0xff, 0x23, 0xe6, 0x42, 0x40, 0x7d, 0xe9, 0x85, + 0x64, 0xd1, 0x97, 0x9e, 0x26, 0x9b, 0xfe, 0x47, 0x3d, 0xf4, 0x1e, 0x3c, 0x46, 0xba, 0x77, 0xe0, + 0x0e, 0xbb, 0xfd, 0x8e, 0x43, 0x80, 0xcf, 0xda, 0x3d, 0x16, 0x4f, 0xe6, 0x39, 0x12, 0xf8, 0x2c, + 0x9d, 0x3d, 0x61, 0x18, 0x88, 0xa5, 0x7e, 0x93, 0x50, 0x36, 0x29, 0x21, 0xb2, 0x41, 0x16, 0xf9, + 0x6f, 0x8f, 0x7a, 0x3d, 0x36, 0xb2, 0x45, 0x7c, 0x69, 0x4d, 0xe6, 0x4d, 0x28, 0x78, 0x31, 0x2a, + 0xb8, 0x32, 0xea, 0xf5, 0xd0, 0x2b, 0x00, 0x7d, 0xcf, 0x39, 0xec, 0xfa, 0x3e, 0x55, 0x3f, 0x84, + 0x5e, 0x36, 0x51, 0xaa, 0x38, 0x18, 0x7d, 0xaf, 0x4e, 0x13, 0xd1, 0x5f, 0x01, 0x71, 0xc1, 0x23, + 0xbe, 0xa9, 0xd4, 0xd4, 0x84, 0x21, 0x44, 0xf3, 0xc4, 0xb8, 0x53, 0xcf, 0xbe, 0x6b, 0x75, 0x3f, + 0xe1, 0x96, 0xc2, 0x6f, 0xc3, 0x32, 0x33, 0xf2, 0xdc, 0xed, 0x06, 0x07, 0x4c, 0x5a, 0x7e, 0x18, + 0x51, 0x5b, 0x10, 0x97, 0x7f, 0x99, 0x03, 0x50, 0x77, 0x2d, 0x0e, 0xfb, 0x70, 0x05, 0x66, 0xf0, + 0x1d, 0x80, 0xbf, 0x25, 0x90, 0x97, 0x58, 0x52, 0xae, 0xf8, 0x12, 0x4b, 0x28, 0xf0, 0x6a, 0x34, + 0xdd, 0x7d, 0xf2, 0x9c, 0x95, 0x89, 0x1e, 0x1e, 0x86, 0x34, 0x29, 0x26, 0x73, 0xd2, 0x24, 0x54, + 0x03, 0x88, 0x80, 0x18, 0xd8, 0xad, 0x74, 0x39, 0xf2, 0x68, 0x66, 0x19, 0x0c, 0xfa, 0x37, 0x02, + 0x73, 0x10, 0xa7, 0x4f, 0x44, 0x86, 0xb6, 0x21, 0x67, 0xb7, 0x43, 0x1f, 0x92, 0x09, 0xf0, 0x14, + 0xe7, 0x59, 0xbc, 0x9f, 0x08, 0xa2, 0x62, 0x31, 0x68, 0xc7, 0xc2, 0xa2, 0x91, 0x42, 0x90, 0x06, + 0xb3, 0x2c, 0x96, 0xe3, 0x04, 0x58, 0x23, 0x16, 0xca, 0x91, 0x81, 0x19, 0x92, 0x44, 0x51, 0xa6, + 0x60, 0x51, 0x1b, 0x5f, 0x84, 0xac, 0x65, 0xd5, 0x99, 0x53, 0xe6, 0x42, 0x74, 0xc3, 0xb0, 0xac, + 0x3a, 0x0f, 0x7d, 0x7b, 0x28, 0xb0, 0x61, 0x62, 0xf4, 0xd7, 0x50, 0x10, 0xc4, 0x67, 0xe6, 0xce, + 0x4c, 0xfa, 0xa0, 0x1b, 0x25, 0x8b, 0x9b, 0x86, 0x40, 0x8d, 0x6a, 0x20, 0x6f, 0x8f, 0x3e, 0x70, + 0xd5, 0xc1, 0x80, 0xf8, 0x3f, 0xdc, 0x71, 0x87, 0x54, 0x6c, 0xcb, 0x47, 0x38, 0x80, 0x4e, 0x7b, + 0x30, 0x70, 0x3a, 0x3c, 0x57, 0x7c, 0x4f, 0x49, 0x72, 0xa2, 0x26, 0x2c, 0x5b, 0x6e, 0x30, 0x1a, + 0x50, 0xe3, 0x89, 0x4a, 0x7f, 0x88, 0x2f, 0x14, 0xd4, 0xf9, 0x99, 0x40, 0xa6, 0xf9, 0x38, 0x93, + 0x5b, 0xac, 0xdc, 0xee, 0x0f, 0x13, 0x97, 0x8b, 0x34, 0xb3, 0xe2, 0x8a, 0x43, 0x8e, 0x4f, 0xd5, + 0xf8, 0x35, 0x85, 0x9c, 0xaa, 0xfc, 0x9a, 0x12, 0x5d, 0x4e, 0x9e, 0x1f, 0x03, 0xd0, 0x41, 0x94, + 0x5f, 0x02, 0x40, 0x47, 0x0c, 0x96, 0xe3, 0xcb, 0x9c, 0x80, 0x11, 0xc5, 0xc6, 0xe2, 0x75, 0x80, + 0x9b, 0xfd, 0xae, 0x57, 0x77, 0x83, 0x83, 0x7e, 0x47, 0xc0, 0x09, 0x29, 0xfc, 0x7d, 0xbf, 0xeb, + 0x39, 0x87, 0x24, 0xf9, 0xfb, 0xef, 0xce, 0x09, 0x44, 0xa6, 0xf0, 0x3f, 0x7a, 0x16, 0xe6, 0xf0, + 0x2f, 0x3b, 0x32, 0x01, 0xa1, 0xcf, 0x8e, 0x84, 0x9b, 0x85, 0xd0, 0x0e, 0x09, 0xd0, 0x0d, 0x82, + 0x1d, 0xde, 0x1d, 0x04, 0x82, 0xf0, 0xca, 0x81, 0xc2, 0xbb, 0x83, 0x20, 0x09, 0xfb, 0x27, 0x10, + 0xa3, 0x6a, 0x58, 0x75, 0x8e, 0x3e, 0xcf, 0x20, 0xca, 0xc9, 0xdb, 0x1a, 0x9b, 0x6b, 0x0e, 0xc7, + 0x1b, 0x13, 0xe3, 0x84, 0x25, 0xd8, 0x48, 0x25, 0xac, 0x6a, 0x99, 0x2a, 0x43, 0x98, 0x50, 0x4b, + 0x2b, 0xe1, 0x1f, 0x74, 0x9c, 0x3d, 0x92, 0x1c, 0xab, 0x44, 0x48, 0x8c, 0x36, 0x61, 0x89, 0xca, + 0xf8, 0x61, 0x14, 0x1b, 0x26, 0xe2, 0x92, 0xbd, 0x2d, 0x0a, 0x73, 0x23, 0x7e, 0x3e, 0xc1, 0x80, + 0x2a, 0x30, 0x43, 0x2e, 0x84, 0xcc, 0x84, 0xfb, 0x8c, 0x78, 0x13, 0x4e, 0xae, 0x23, 0xb2, 0xaf, + 0x90, 0x3b, 0xb0, 0xb8, 0xaf, 0x10, 0x52, 0xf4, 0x16, 0x80, 0xe6, 0x0d, 0xfb, 0xbd, 0x1e, 0x41, + 0xc4, 0xcb, 0x93, 0xab, 0xd4, 0xd9, 0xf8, 0x7a, 0x24, 0xa5, 0x44, 0x44, 0x0c, 0xbd, 0x85, 0xfc, + 0x76, 0x12, 0xb8, 0x79, 0x42, 0x59, 0x8a, 0x0e, 0xb3, 0x74, 0x31, 0x12, 0x74, 0x49, 0x86, 0x97, + 0x2d, 0x60, 0x13, 0x52, 0x74, 0x49, 0x96, 0x9e, 0x46, 0x97, 0x14, 0x18, 0x94, 0x6d, 0x58, 0x19, + 0xd7, 0xb0, 0xd8, 0x15, 0x56, 0x3a, 0xea, 0x15, 0xf6, 0xff, 0xb2, 0x30, 0x4f, 0x4a, 0xe3, 0xbb, + 0xb0, 0x0a, 0x0b, 0xd6, 0xe8, 0x83, 0x10, 0x7a, 0x81, 0xef, 0xc6, 0xa4, 0x7e, 0xbe, 0x98, 0x21, + 0xaa, 0xa9, 0x62, 0x1c, 0x48, 0x83, 0x45, 0x7e, 0x12, 0x6c, 0x71, 0xb3, 0xf0, 0x10, 0xd8, 0x91, + 0xc3, 0x07, 0xa5, 0xa3, 0x78, 0x25, 0x98, 0xa2, 0xf3, 0x20, 0x7b, 0x9c, 0xf3, 0x20, 0x77, 0xa4, + 0xf3, 0xe0, 0x1d, 0x98, 0xe7, 0x5f, 0x23, 0x3b, 0xf9, 0xcc, 0xc3, 0xed, 0xe4, 0xb1, 0xc2, 0x50, + 0x2d, 0xdc, 0xd1, 0x67, 0xa7, 0xee, 0xe8, 0x44, 0xf7, 0xc7, 0x57, 0x59, 0x2a, 0x30, 0x2f, 0x2b, + 0x83, 0x84, 0xb9, 0xd9, 0x2a, 0x35, 0x7f, 0xc0, 0x29, 0xf9, 0x12, 0xcc, 0xd5, 0xfa, 0x5c, 0xed, + 0x23, 0xbc, 0xb7, 0xf7, 0x78, 0xa2, 0x28, 0x2e, 0x84, 0x94, 0xe1, 0xe9, 0x96, 0x7d, 0x14, 0xa7, + 0xdb, 0x0d, 0x00, 0xe6, 0x6f, 0x10, 0x85, 0xa7, 0x20, 0x4b, 0x86, 0x7b, 0xd6, 0xc6, 0x9f, 0xfd, + 0x05, 0x62, 0xbc, 0x3b, 0x31, 0x03, 0x11, 0x75, 0x6f, 0xaf, 0x3f, 0xf2, 0x82, 0x58, 0x3c, 0x37, + 0xe6, 0x64, 0x8f, 0x8f, 0x04, 0x92, 0x27, 0x6e, 0x0f, 0x09, 0xb6, 0x47, 0x3b, 0x20, 0xe8, 0xcd, + 0xd0, 0xb2, 0x6d, 0x6a, 0x78, 0x6b, 0x25, 0xd5, 0x43, 0x13, 0xed, 0xd9, 0x94, 0xaf, 0x25, 0x11, + 0x55, 0xf7, 0x07, 0x0c, 0xf5, 0xab, 0x00, 0xa1, 0xde, 0x9d, 0x8f, 0x35, 0xbd, 0x2f, 0x85, 0xa9, + 0x62, 0x2f, 0x47, 0xb4, 0x42, 0x6b, 0xb2, 0x8f, 0xaa, 0x35, 0x36, 0x14, 0x1a, 0x1f, 0x06, 0xed, + 0xc8, 0x50, 0x03, 0xac, 0x50, 0x92, 0x25, 0x3b, 0x13, 0x0f, 0xc3, 0x1d, 0xc9, 0xc1, 0x13, 0xc3, + 0x70, 0x87, 0x8c, 0xca, 0x9b, 0xb0, 0x24, 0xba, 0xff, 0xdd, 0xf3, 0xf6, 0xd0, 0xdf, 0x52, 0x8c, + 0x2f, 0x29, 0x76, 0x63, 0x11, 0x88, 0xf0, 0x8e, 0x7b, 0xcf, 0xdb, 0xa3, 0xf2, 0x4f, 0xfb, 0xae, + 0x58, 0x57, 0x72, 0xc7, 0xfb, 0x56, 0x02, 0x94, 0x26, 0x17, 0x77, 0x13, 0xe9, 0x2f, 0x20, 0x5d, + 0x26, 0xa4, 0xb2, 0xdc, 0x71, 0xa4, 0xb2, 0xe2, 0x7f, 0x48, 0xb0, 0xa4, 0xab, 0x75, 0x06, 0x81, + 0x4b, 0xf5, 0x07, 0x4f, 0xc2, 0x59, 0x5d, 0xad, 0x3b, 0xcd, 0x46, 0x4d, 0x2f, 0xdd, 0x72, 0xc6, + 0x22, 0xdb, 0x9d, 0x85, 0x27, 0xd2, 0x24, 0x91, 0x9e, 0x61, 0x1d, 0x56, 0xd3, 0xd9, 0x1c, 0xfd, + 0x6e, 0x3c, 0x33, 0x07, 0xca, 0xcb, 0x16, 0xdf, 0x80, 0x25, 0x8e, 0xf4, 0x66, 0xd7, 0x2c, 0x82, + 0x25, 0xbb, 0x04, 0x85, 0x1d, 0xcd, 0xd4, 0x2b, 0xb7, 0x9c, 0x4a, 0xab, 0x56, 0x93, 0x4f, 0xa0, + 0x05, 0x98, 0x63, 0x09, 0x25, 0x55, 0x96, 0xd0, 0x3c, 0xe4, 0x75, 0xc3, 0xd2, 0x4a, 0x2d, 0x53, + 0x93, 0x33, 0xc5, 0x37, 0x60, 0xb1, 0x39, 0xec, 0xde, 0x69, 0x07, 0xee, 0xb6, 0x7b, 0x8f, 0xa8, + 0x09, 0x4e, 0x42, 0xd6, 0x54, 0x77, 0xe5, 0x13, 0x08, 0x60, 0xb6, 0xb9, 0x5d, 0xb2, 0xae, 0x5d, + 0x93, 0x25, 0x54, 0x80, 0x93, 0x5b, 0xa5, 0xa6, 0xb3, 0x5d, 0xb7, 0xe4, 0x0c, 0xfe, 0xa1, 0xee, + 0x5a, 0xe4, 0x47, 0xb6, 0xf8, 0x02, 0x2c, 0x13, 0x59, 0xa1, 0xd6, 0xf5, 0x03, 0xd7, 0x73, 0x87, + 0xa4, 0x0e, 0xf3, 0x90, 0xb7, 0x5c, 0xbc, 0xc8, 0x03, 0x97, 0x56, 0xa0, 0x3e, 0xea, 0x05, 0xdd, + 0x41, 0xcf, 0xfd, 0x58, 0x96, 0x8a, 0x37, 0x60, 0xc9, 0xec, 0x8f, 0x82, 0xae, 0xb7, 0x6f, 0x05, + 0x98, 0x62, 0xff, 0x1e, 0x7a, 0x1c, 0x96, 0x5b, 0x86, 0x5a, 0xdf, 0xd4, 0xb7, 0x5a, 0x8d, 0x96, + 0xe5, 0xd4, 0x55, 0xbb, 0x54, 0xa5, 0x4a, 0x8a, 0x7a, 0xc3, 0xb2, 0x1d, 0x53, 0x2b, 0x69, 0x86, + 0x2d, 0x4b, 0xc5, 0x7f, 0x91, 0x60, 0xb1, 0xe5, 0x33, 0xc3, 0xda, 0x16, 0x71, 0x8f, 0x3b, 0x0f, + 0xeb, 0x2d, 0x4b, 0x33, 0x1d, 0xbb, 0xb1, 0xad, 0x19, 0x4e, 0xcb, 0x52, 0xb7, 0x92, 0xb0, 0x8a, + 0xe7, 0xe0, 0x8c, 0x40, 0x61, 0x6a, 0xa5, 0xc6, 0x8e, 0x66, 0x3a, 0x4d, 0xd5, 0xb2, 0x76, 0x1b, + 0x66, 0x59, 0x96, 0xd0, 0x1a, 0x9c, 0x1a, 0x43, 0x50, 0xaf, 0xa8, 0x72, 0x26, 0x95, 0x67, 0x68, + 0xbb, 0x6a, 0xcd, 0xd9, 0x6c, 0xd8, 0x72, 0xb6, 0x58, 0xc7, 0x07, 0x1d, 0x81, 0x13, 0xa3, 0xb8, + 0xf1, 0x79, 0xc8, 0x19, 0x0d, 0x43, 0x4b, 0x2a, 0x92, 0xe6, 0x21, 0xaf, 0x36, 0x9b, 0x66, 0x63, + 0x87, 0x0c, 0x28, 0xc0, 0x6c, 0x59, 0x33, 0x70, 0xcd, 0xb2, 0x38, 0xa7, 0x69, 0x36, 0xea, 0x0d, + 0x5b, 0x2b, 0xcb, 0xb9, 0xa2, 0xc9, 0x17, 0x0c, 0x2f, 0x74, 0xaf, 0x4f, 0xb5, 0x36, 0x65, 0xad, + 0xa2, 0xb6, 0x6a, 0x36, 0xeb, 0x90, 0x5b, 0x8e, 0xa9, 0xbd, 0xd9, 0xd2, 0x2c, 0xdb, 0x92, 0x25, + 0x24, 0xc3, 0xbc, 0xa1, 0x69, 0x65, 0xcb, 0x31, 0xb5, 0x1d, 0x5d, 0xdb, 0x95, 0x33, 0xb8, 0x4c, + 0xfa, 0x3f, 0xfe, 0x42, 0xf1, 0x4b, 0x09, 0x10, 0x85, 0x62, 0xe3, 0xf8, 0xde, 0x64, 0x7c, 0x36, + 0x60, 0xad, 0x8a, 0x3b, 0x96, 0x34, 0xad, 0xde, 0x28, 0x27, 0xbb, 0xec, 0x14, 0xa0, 0x44, 0x7e, + 0xa3, 0x52, 0x91, 0x25, 0x74, 0x06, 0x1e, 0x4b, 0xa4, 0x97, 0xcd, 0x46, 0x53, 0xce, 0xac, 0x65, + 0xf2, 0x12, 0x3a, 0x9d, 0xca, 0xdc, 0xd6, 0xb4, 0xa6, 0x9c, 0xc5, 0x43, 0x94, 0xc8, 0xe0, 0x13, + 0x90, 0xb2, 0xe7, 0x8a, 0x9f, 0x4a, 0x70, 0x8a, 0x56, 0x93, 0xcf, 0xe6, 0xb0, 0xaa, 0xeb, 0xb0, + 0xca, 0x00, 0x26, 0xc7, 0x55, 0x74, 0x05, 0xe4, 0x58, 0x2e, 0xad, 0xe6, 0xe3, 0xb0, 0x1c, 0x4b, + 0x25, 0xf5, 0xc8, 0xe0, 0xb5, 0x1a, 0x4b, 0xde, 0xd4, 0x2c, 0xdb, 0xd1, 0x2a, 0x95, 0x86, 0x69, + 0xd3, 0x8a, 0x64, 0x8b, 0x0a, 0x2c, 0x97, 0xdc, 0x61, 0x80, 0xef, 0x20, 0x9e, 0xdf, 0xed, 0x7b, + 0xa4, 0x0a, 0x0b, 0x30, 0xa7, 0xbd, 0x65, 0x6b, 0x86, 0xa5, 0x37, 0x0c, 0xf9, 0x44, 0x71, 0x3d, + 0x41, 0xc3, 0x57, 0x8d, 0x65, 0x55, 0xe5, 0x13, 0xc5, 0x36, 0x2c, 0x70, 0x43, 0x56, 0x3a, 0x2b, + 0x36, 0x60, 0x8d, 0xcf, 0x35, 0xb2, 0x7e, 0x93, 0x4d, 0x58, 0x85, 0x95, 0x74, 0xbe, 0x66, 0xcb, + 0x12, 0x1e, 0x85, 0x44, 0x0e, 0x4e, 0xcf, 0x14, 0xff, 0x57, 0x82, 0x55, 0x16, 0x49, 0x93, 0x69, + 0x10, 0x28, 0xa6, 0x35, 0x01, 0x7d, 0x2b, 0xc2, 0x25, 0xdb, 0x6c, 0x59, 0xb6, 0x56, 0x76, 0xca, + 0xda, 0x8e, 0x5e, 0xd2, 0xc8, 0x74, 0xd1, 0x4d, 0xad, 0xae, 0x19, 0x76, 0xe2, 0xd3, 0xcf, 0xc0, + 0xd3, 0x53, 0x68, 0x8d, 0x86, 0xcd, 0x7f, 0xe3, 0x55, 0xf2, 0x34, 0x3c, 0x35, 0x85, 0x38, 0x24, + 0xcc, 0x14, 0xdf, 0x85, 0xf9, 0x58, 0x9c, 0x8e, 0xd3, 0xf0, 0x98, 0xf8, 0xbb, 0xe9, 0x7a, 0x9d, + 0xae, 0xb7, 0x2f, 0x9f, 0x48, 0x66, 0x98, 0x23, 0xcf, 0xc3, 0x19, 0x64, 0x41, 0x8a, 0x19, 0xb6, + 0x3b, 0x3c, 0xec, 0x7a, 0xed, 0xc0, 0xed, 0xc8, 0x99, 0xe2, 0x55, 0x58, 0x88, 0xa1, 0x03, 0xe2, + 0x9e, 0xaf, 0x35, 0xd8, 0x7e, 0x55, 0xd7, 0xca, 0x7a, 0xab, 0x2e, 0xcf, 0xe0, 0xa5, 0x58, 0xd5, + 0xb7, 0xaa, 0x32, 0x14, 0xbf, 0x90, 0xb0, 0xc4, 0x4c, 0xfa, 0xa7, 0x5e, 0x51, 0xf9, 0x58, 0xe1, + 0x79, 0x42, 0x31, 0x47, 0x35, 0xcb, 0xa2, 0x0a, 0xd0, 0x75, 0x58, 0x65, 0x3f, 0x1c, 0xd5, 0x28, + 0x3b, 0x55, 0xd5, 0x2c, 0xef, 0xaa, 0x26, 0x9e, 0x3c, 0xb7, 0xe4, 0x0c, 0x59, 0x11, 0x42, 0x8a, + 0x63, 0x37, 0x5a, 0xa5, 0xaa, 0x9c, 0xc5, 0x13, 0x30, 0x96, 0xde, 0xd4, 0x0d, 0x39, 0x47, 0xd6, + 0x57, 0x8a, 0x9a, 0x14, 0x8b, 0xf3, 0x67, 0x8a, 0xf7, 0x25, 0x38, 0x6d, 0x75, 0xf7, 0xbd, 0x76, + 0x30, 0x1a, 0xba, 0x6a, 0x6f, 0xbf, 0x3f, 0xec, 0x06, 0x07, 0x87, 0xd6, 0xa8, 0x1b, 0xb8, 0xe8, + 0x0a, 0x5c, 0xb4, 0xf4, 0x2d, 0x43, 0xb5, 0xf1, 0xfa, 0x50, 0x6b, 0x5b, 0x0d, 0x53, 0xb7, 0xab, + 0x75, 0xc7, 0x6a, 0xe9, 0xa9, 0xa9, 0x73, 0x01, 0xce, 0x4f, 0x26, 0xad, 0x69, 0x5b, 0x6a, 0xe9, + 0x96, 0x2c, 0x4d, 0x2f, 0x70, 0x53, 0xad, 0xa9, 0x46, 0x49, 0x2b, 0x3b, 0x3b, 0xd7, 0xe4, 0x0c, + 0xba, 0x08, 0x4f, 0x4e, 0x26, 0xad, 0xe8, 0x4d, 0x0b, 0x93, 0x65, 0xa7, 0x7f, 0xb7, 0x6a, 0xd5, + 0x31, 0x55, 0xae, 0xd8, 0x05, 0x39, 0xe9, 0xf7, 0x9c, 0x52, 0xb7, 0x9b, 0x2d, 0xc3, 0xa0, 0xbb, + 0xe4, 0x12, 0x14, 0x1a, 0x76, 0x55, 0x33, 0x19, 0xf4, 0x2d, 0xc1, 0xba, 0x6d, 0x19, 0x6a, 0xcb, + 0xae, 0x36, 0x4c, 0xfd, 0x6d, 0xb2, 0x5d, 0xae, 0xc2, 0x8a, 0x55, 0x53, 0x4b, 0xdb, 0x64, 0x66, + 0xea, 0x86, 0x53, 0xaa, 0xaa, 0x86, 0xa1, 0xd5, 0x64, 0x28, 0xfe, 0x8f, 0x44, 0xf5, 0xde, 0xe3, + 0x1c, 0xa4, 0xd0, 0xb3, 0x70, 0xb9, 0xb1, 0x6d, 0xab, 0x4e, 0xb3, 0xd6, 0xda, 0xd2, 0x0d, 0xc7, + 0xba, 0x65, 0x94, 0xf8, 0x41, 0x5a, 0x4a, 0xef, 0x28, 0x97, 0xe1, 0xc2, 0x54, 0xea, 0x08, 0xa4, + 0xf6, 0x12, 0x28, 0x53, 0x29, 0x59, 0x43, 0x8a, 0xdf, 0x48, 0x70, 0x66, 0x8a, 0xae, 0x10, 0x3d, + 0x07, 0x57, 0xaa, 0x9a, 0x5a, 0xae, 0x69, 0x96, 0xe5, 0xe0, 0xf6, 0x6a, 0x86, 0xcd, 0xd4, 0xf2, + 0x63, 0xf7, 0x8b, 0x2b, 0x70, 0x71, 0x3a, 0x79, 0x74, 0xf2, 0x5c, 0x86, 0x0b, 0xd3, 0x49, 0xd9, + 0x49, 0x94, 0xc1, 0xbb, 0xc6, 0x74, 0xca, 0xf0, 0x04, 0xcb, 0x16, 0x3f, 0x97, 0xe0, 0xd4, 0xf8, + 0x0b, 0x3b, 0xae, 0x9b, 0x6e, 0x58, 0xb6, 0x5a, 0xab, 0x39, 0x4d, 0xd5, 0x54, 0xeb, 0x8e, 0x66, + 0x98, 0x8d, 0x5a, 0x6d, 0xdc, 0xce, 0x7d, 0x01, 0xce, 0x4f, 0x26, 0xb5, 0x4a, 0xa6, 0xde, 0xc4, + 0x5b, 0xa0, 0x02, 0x1b, 0x93, 0xa9, 0x34, 0xbd, 0xa4, 0xc9, 0x99, 0xcd, 0xd7, 0xbf, 0xfa, 0xf5, + 0xc6, 0x89, 0xaf, 0xee, 0x6f, 0x48, 0xdf, 0xde, 0xdf, 0x90, 0x7e, 0x75, 0x7f, 0x43, 0x7a, 0xfb, + 0x99, 0x63, 0x84, 0x01, 0xff, 0x60, 0x96, 0xd8, 0xa1, 0x5c, 0xff, 0x53, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x0c, 0x83, 0xd8, 0x99, 0x13, 0x96, 0x01, 0x00, } func (this *PluginSpecV1) Equal(that interface{}) bool { @@ -22641,12 +22620,6 @@ func (this *JamfSpecV1) Equal(that interface{}) bool { if this.ApiEndpoint != that1.ApiEndpoint { return false } - if this.Username != that1.Username { - return false - } - if this.Password != that1.Password { - return false - } if len(this.Inventory) != len(that1.Inventory) { return false } @@ -22655,12 +22628,6 @@ func (this *JamfSpecV1) Equal(that interface{}) bool { return false } } - if this.ClientId != that1.ClientId { - return false - } - if this.ClientSecret != that1.ClientSecret { - return false - } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -44745,20 +44712,6 @@ func (m *JamfSpecV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.ClientSecret) > 0 { - i -= len(m.ClientSecret) - copy(dAtA[i:], m.ClientSecret) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ClientSecret))) - i-- - dAtA[i] = 0x4a - } - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ClientId))) - i-- - dAtA[i] = 0x42 - } if len(m.Inventory) > 0 { for iNdEx := len(m.Inventory) - 1; iNdEx >= 0; iNdEx-- { { @@ -44773,20 +44726,6 @@ func (m *JamfSpecV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } } - if len(m.Password) > 0 { - i -= len(m.Password) - copy(dAtA[i:], m.Password) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Password))) - i-- - dAtA[i] = 0x32 - } - if len(m.Username) > 0 { - i -= len(m.Username) - copy(dAtA[i:], m.Username) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Username))) - i-- - dAtA[i] = 0x2a - } if len(m.ApiEndpoint) > 0 { i -= len(m.ApiEndpoint) copy(dAtA[i:], m.ApiEndpoint) @@ -55578,28 +55517,12 @@ func (m *JamfSpecV1) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.Username) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Password) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } if len(m.Inventory) > 0 { for _, e := range m.Inventory { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } } - l = len(m.ClientId) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.ClientSecret) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -120129,70 +120052,6 @@ func (m *JamfSpecV1) Unmarshal(dAtA []byte) error { } m.ApiEndpoint = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Username", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Username = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Password", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Password = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Inventory", wireType) @@ -120227,70 +120086,6 @@ func (m *JamfSpecV1) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientSecret", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientSecret = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/lib/config/configuration.go b/lib/config/configuration.go index 53cf7dc5ff381..a704da66dd929 100644 --- a/lib/config/configuration.go +++ b/lib/config/configuration.go @@ -2930,7 +2930,7 @@ func applyJamfConfig(fc *FileConfig, cfg *servicecfg.Config) error { return trace.Wrap(err) } - jamfSpec, err := fc.Jamf.toJamfSpecV1(creds) + jamfSpec, err := fc.Jamf.toJamfSpecV1() if err != nil { return trace.Wrap(err) } diff --git a/lib/config/configuration_test.go b/lib/config/configuration_test.go index 1ebf15fe1c166..775d91dfe99b8 100644 --- a/lib/config/configuration_test.go +++ b/lib/config/configuration_test.go @@ -3425,8 +3425,6 @@ jamf_service: Spec: &types.JamfSpecV1{ Enabled: true, ApiEndpoint: "https://yourtenant.jamfcloud.com", - Username: "llama", - Password: password, }, Credentials: &servicecfg.JamfCredentials{ Username: "llama", @@ -3443,10 +3441,8 @@ jamf_service: client_secret_file: %v`, passwordFile), want: servicecfg.JamfConfig{ Spec: &types.JamfSpecV1{ - Enabled: true, - ApiEndpoint: "https://yourtenant.jamfcloud.com", - ClientId: "llama-UUID", - ClientSecret: password, + Enabled: true, + ApiEndpoint: "https://yourtenant.jamfcloud.com", }, Credentials: &servicecfg.JamfCredentials{ ClientID: "llama-UUID", @@ -3472,8 +3468,6 @@ jamf_service: Name: "jamf2", SyncDelay: types.Duration(1 * time.Minute), ApiEndpoint: "https://yourtenant.jamfcloud.com", - Username: "llama", - Password: password, Inventory: []*types.JamfInventoryEntry{ { FilterRsql: "1==1", diff --git a/lib/config/fileconf.go b/lib/config/fileconf.go index 406eef1db63c0..268fc42530934 100644 --- a/lib/config/fileconf.go +++ b/lib/config/fileconf.go @@ -2576,7 +2576,7 @@ type JamfInventoryEntry struct { PageSize int32 `yaml:"page_size,omitempty"` } -func (j *JamfService) toJamfSpecV1(creds *servicecfg.JamfCredentials) (*types.JamfSpecV1, error) { +func (j *JamfService) toJamfSpecV1() (*types.JamfSpecV1, error) { switch { case j == nil: return nil, trace.BadParameter("jamf_service is nil") @@ -2601,11 +2601,6 @@ func (j *JamfService) toJamfSpecV1(creds *servicecfg.JamfCredentials) (*types.Ja SyncDelay: types.Duration(j.SyncDelay), ApiEndpoint: j.APIEndpoint, Inventory: inventory, - // TODO(tigrato): DELETE once we remove the fields from the config. - Username: creds.Username, - Password: creds.Password, - ClientId: creds.ClientID, - ClientSecret: creds.ClientSecret, } // Validate. diff --git a/lib/service/service_test.go b/lib/service/service_test.go index 27faff7f19109..6e3ab2554977b 100644 --- a/lib/service/service_test.go +++ b/lib/service/service_test.go @@ -1433,8 +1433,6 @@ func TestEnterpriseServicesEnabled(t *testing.T) { Spec: &types.JamfSpecV1{ Enabled: true, ApiEndpoint: "https://example.jamfcloud.com", - Username: "llama", - Password: "supersecret!!1!ONE", }, }, }, diff --git a/lib/service/servicecfg/config_test.go b/lib/service/servicecfg/config_test.go index 6c47d7d7daf58..9a24153ef2af0 100644 --- a/lib/service/servicecfg/config_test.go +++ b/lib/service/servicecfg/config_test.go @@ -491,8 +491,6 @@ func TestVerifyEnabledService(t *testing.T) { Spec: &types.JamfSpecV1{ Enabled: true, ApiEndpoint: "https://example.jamfcloud.com", - Username: "llama", - Password: "supersecret!!1!ONE", }, }, },