Skip to content

Commit

Permalink
#108 make loading of scripting-addition more robust - validating vers…
Browse files Browse the repository at this point in the history 
…ion and functionality
  • Loading branch information
@koekeishiya
koekeishiya committed Jul 10, 2019
1 parent f3319b3 commit 6dedd58
Show file tree
Hide file tree
Showing 9 changed files with 2,633 additions and 2,484 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [Unreleased]
### Changed
- Dragging a tiled window to another display using the mouse will cause the window to be warped to that display upon release [#103](https://github.com/koekeishiya/yabai/issues/103)
- Make loading scripting-addition more robust - validating version and functionality [#108](https://github.com/koekeishiya/yabai/issues/108)

## [1.0.6] - 2019-07-09
### Changed
Expand Down
26 changes: 26 additions & 0 deletions src/osax/common.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#ifndef SA_COMMON_H
#define SA_COMMON_H

#define OSAX_VERSION "1.0.0"

#define OSAX_PAYLOAD_SUCCESS 0
#define OSAX_PAYLOAD_NOT_FOUND 1
#define OSAX_PAYLOAD_ALREADY_LOADED 2
#define OSAX_PAYLOAD_NOT_LOADED 3
#define OSAX_PAYLOAD_UNAUTHORIZED -1708

#define OSAX_ATTRIB_DOCK_SPACES 0x01
#define OSAX_ATTRIB_DPPM 0x02
#define OSAX_ATTRIB_ADD_SPACE 0x04
#define OSAX_ATTRIB_REM_SPACE 0x08
#define OSAX_ATTRIB_MOV_SPACE 0x10
#define OSAX_ATTRIB_SET_WINDOW 0x20

#define OSAX_ATTRIB_ALL (OSAX_ATTRIB_DOCK_SPACES | \
OSAX_ATTRIB_DPPM | \
OSAX_ATTRIB_ADD_SPACE | \
OSAX_ATTRIB_REM_SPACE | \
OSAX_ATTRIB_MOV_SPACE | \
OSAX_ATTRIB_SET_WINDOW)

#endif
11 changes: 6 additions & 5 deletions src/osax/loader.m
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import "common.h"

@interface Loader : NSObject
@end
Expand All @@ -13,33 +14,33 @@ OSErr yabai_osax_load(const AppleEvent *event, AppleEvent *reply, long context)
{
NSLog(@"[yabai] attempting to load scripting addition..");

OSErr result = noErr;
OSErr result = OSAX_PAYLOAD_SUCCESS;
NSBundle* loader_bundle = [NSBundle bundleForClass:[Loader class]];
NSString *payload_path = [loader_bundle pathForResource:@"payload" ofType:@"bundle"];
NSBundle *payload_bundle = [NSBundle bundleWithPath:payload_path];

if (!payload_bundle) {
NSLog(@"[yabai] could not locate payload!");
result = 2;
result = OSAX_PAYLOAD_NOT_FOUND;
goto end;
}

if ([payload_bundle isLoaded]) {
NSLog(@"[yabai] payload has already been loaded!");
result = 2;
result = OSAX_PAYLOAD_ALREADY_LOADED;
goto end;
}

if (![payload_bundle load]) {
NSLog(@"[yabai] could not load payload!");
result = 2;
result = OSAX_PAYLOAD_NOT_LOADED;
goto end;
}

_instance = [payload_bundle principalClass];

end:
if (result == noErr) {
if (result == OSAX_PAYLOAD_SUCCESS) {
NSLog(@"[yabai] scripting addition loaded successfully..");
} else {
NSLog(@"[yabai] failed to load scriping addition!");
Expand Down
43 changes: 38 additions & 5 deletions src/osax/payload.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <string.h>
#include <stdio.h>

#include "common.h"

#define SOCKET_PATH_FMT "/tmp/yabai-sa_%s.socket"

#define BUF_SIZE 256
Expand Down Expand Up @@ -781,7 +783,31 @@ static inline bool can_focus_window()
return set_front_window_fp != 0;
}

static void handle_message(const char *message)
static void do_handshake(int sockfd)
{
uint32_t attrib = 0;

if (dock_spaces != nil) attrib |= OSAX_ATTRIB_DOCK_SPACES;
if (dp_desktop_picture_manager != nil) attrib |= OSAX_ATTRIB_DPPM;
if (can_create_space()) attrib |= OSAX_ATTRIB_ADD_SPACE;
if (can_destroy_space()) attrib |= OSAX_ATTRIB_REM_SPACE;
if (can_move_space()) attrib |= OSAX_ATTRIB_MOV_SPACE;
if (can_focus_window()) attrib |= OSAX_ATTRIB_SET_WINDOW;

char bytes[BUFSIZ] = {};
int version_length = strlen(OSAX_VERSION);
int attrib_length = sizeof(uint32_t);
int bytes_length = version_length + 1 + attrib_length + 1;

memcpy(bytes, OSAX_VERSION, version_length);
memcpy(bytes + version_length + 1, &attrib, attrib_length);
bytes[version_length] = '\0';
bytes[bytes_length] = '\n';

send(sockfd, bytes, bytes_length, 0);
}

static void handle_message(int sockfd, const char *message)
{
/*
* NOTE(koekeishiya): interaction is supposed to happen through an
Expand All @@ -790,7 +816,9 @@ static void handle_message(const char *message)
*/

Token token = get_token(&message);
if (token_equals(token, "space")) {
if (token_equals(token, "handshake")) {
do_handshake(sockfd);
} else if (token_equals(token, "space")) {
if (!can_focus_space()) return;
do_space_change(message);
} else if (token_equals(token, "space_create")) {
Expand Down Expand Up @@ -840,7 +868,7 @@ static bool recv_socket(int sockfd, char *message, size_t message_size)

char message[BUF_SIZE];
if (recv_socket(sockfd, message, sizeof(message))) {
handle_message(message);
handle_message(sockfd, message);
}

shutdown(sockfd, SHUT_RDWR);
Expand Down Expand Up @@ -885,8 +913,14 @@ @implementation Payload
+ (void) load
{
NSLog(@"[yabai-sa] loaded payload");
init_instances();

const char *user = getenv("USER");
if (!user) {
NSString *ns_user = NSUserName();
if (ns_user) user = [ns_user UTF8String];
}

char *user = getenv("USER");
if (!user) {
NSLog(@"[yabai-sa] could not get 'env USER'! abort..");
return;
Expand All @@ -896,7 +930,6 @@ + (void) load
snprintf(socket_file, sizeof(socket_file), SOCKET_PATH_FMT, user);

if (start_daemon(socket_file)) {
init_instances();
NSLog(@"[yabai-sa] now listening..");
} else {
NSLog(@"[yabai-sa] failed to spawn thread..");
Expand Down
2 changes: 2 additions & 0 deletions src/osax/sa.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef SA_H
#define SA_H

#include "common.h"

int scripting_addition_load(void);
bool scripting_addition_is_installed(void);
int scripting_addition_uninstall(void);
Expand Down
76 changes: 75 additions & 1 deletion src/osax/sa.m
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
#include "sa.h"

extern char g_sa_socket_file[MAXLEN];

@interface SALoader : NSObject<SBApplicationDelegate> {}
- (void) eventDidFail:(const AppleEvent*)event withError:(NSError*)error;
@end

@implementation SALoader { @public int result; }
- (void) eventDidFail:(const AppleEvent*)event withError:(NSError*)error
{
NSNumber *errorNumber = [[error userInfo] objectForKey:@"ErrorNumber"];
result = [errorNumber intValue];
}
@end

static char osax_base_dir[MAXLEN];
static char osax_contents_dir[MAXLEN];
static char osax_contents_macos_dir[MAXLEN];
Expand Down Expand Up @@ -161,6 +175,46 @@ static void scripting_addition_prepare_binaries(void)
system(cmd);
}

static char *scripting_addition_request_handshake(uint32_t *flags)
{
char *result = NULL;

int sockfd;
char message[MAXLEN];

if (socket_connect_un(&sockfd, g_sa_socket_file)) {
snprintf(message, sizeof(message), "handshake");
if (socket_write(sockfd, message)) {
int length;
result = socket_read(sockfd, &length);
if (!result) goto out;

char *attrib = result + 6;
assert(attrib[-1] == '\0');
memcpy(flags, attrib, sizeof(uint32_t));
}
}

out:
socket_close(sockfd);
return result;
}

static void scripting_addition_perform_validation(void)
{
uint32_t attrib;
char *version = scripting_addition_request_handshake(&attrib);
if (version) debug("yabai: osax version = %s, osax attrib = 0x%X\n", version, attrib);

if (!version || !string_equals(version, OSAX_VERSION)) {
warn("yabai: scripting-addition payload is outdated, please reinstall!\n");
} else if ((attrib & OSAX_ATTRIB_ALL) != OSAX_ATTRIB_ALL) {
warn("yabai: scripting-addition payload failed to locate required resources inside Dock.app!\n");
} else {
debug("yabai: scripting-addition payload successfully located all requsted resources inside Dock.app..\n");
}
}

bool scripting_addition_is_installed(void)
{
if (osax_base_dir[0] == 0) scripting_addition_set_path();
Expand Down Expand Up @@ -233,6 +287,9 @@ int scripting_addition_load(void)
{
if (!scripting_addition_is_installed()) return 1;

SALoader *loader = [[SALoader alloc] init];
loader->result = OSAX_PAYLOAD_SUCCESS;

// temporarily redirect stderr to /dev/null to silence
// meaningless warning reported by the scripting-bridge
// framework, because Dock.app does not provide a .sdef
Expand All @@ -251,7 +308,7 @@ int scripting_addition_load(void)
[dock setTimeout:10*60];
[dock setSendMode:kAEWaitReply];
[dock sendEvent:'ascr' id:'gdut' parameters:0];
[dock setSendMode:kAEWaitReply];
[dock setDelegate:loader];
[dock sendEvent:'YBSA' id:'load' parameters:0];
[dock release];

Expand All @@ -263,5 +320,22 @@ int scripting_addition_load(void)
dup2(stderr_fd, 2);
close(stderr_fd);

if (loader->result == OSAX_PAYLOAD_NOT_FOUND) {
warn("yabai: scripting-addition was located, but is not valid - the payload could not be found!\n");
} else if (loader->result == OSAX_PAYLOAD_NOT_LOADED) {
warn("yabai: scripting-addition was located, but failed to inject payload into Dock.app!\n");
} else if (loader->result == OSAX_PAYLOAD_UNAUTHORIZED) {
warn("yabai: scripting-addition could not inject payload into Dock.app, make sure SIP is disabled!\n");
} else if (loader->result == OSAX_PAYLOAD_ALREADY_LOADED) {
warn("yabai: scripting-addition has previously injected the payload into Dock.app!\n");
scripting_addition_perform_validation();
} else if (loader->result == OSAX_PAYLOAD_SUCCESS) {
debug("yabai: scripting-addition successfully injected payload into Dock.app..\n");
scripting_addition_perform_validation();
} else {
warn("yabai: scripting-addition could not inject payload into Dock.app due to unknown error (%d)!\n", loader->result);
}

[loader release];
return 0;
}
66 changes: 33 additions & 33 deletions src/osax/sa_loader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ unsigned char __src_osax_loader[] = {
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x5f, 0x74, 0x65,
0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x5f, 0x5f, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x20, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0d, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x10, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x15, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0d, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x5f, 0x5f, 0x73, 0x74, 0x75, 0x62, 0x73, 0x00,
Expand Down Expand Up @@ -157,8 +157,8 @@ unsigned char __src_osax_loader[] = {
0x00, 0x00, 0x00, 0x00, 0x20, 0x22, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
0x6b, 0xe7, 0x94, 0x97, 0x8d, 0x03, 0x31, 0xc8, 0xb6, 0x22, 0xcb, 0xa9,
0x13, 0x11, 0xd2, 0xff, 0x32, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
0x6c, 0x64, 0x15, 0x1a, 0xe8, 0xa6, 0x3c, 0x19, 0x8b, 0xcc, 0xa7, 0x93,
0x2a, 0x66, 0xaa, 0x0f, 0x32, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0a, 0x00, 0x00, 0x0e, 0x0a, 0x00,
0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc2, 0x01,
0x2a, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Expand Down Expand Up @@ -277,30 +277,30 @@ unsigned char __src_osax_loader[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x55, 0x48, 0x89, 0xe5, 0x41, 0x56, 0x53, 0x48, 0x8d, 0x3d, 0xf2, 0x02,
0x00, 0x00, 0x31, 0xc0, 0xe8, 0xf1, 0x00, 0x00, 0x00, 0x48, 0x8b, 0x1d,
0xbc, 0x04, 0x00, 0x00, 0x48, 0x8b, 0x3d, 0xbd, 0x04, 0x00, 0x00, 0x48,
0x8b, 0x35, 0x76, 0x04, 0x00, 0x00, 0x4c, 0x8b, 0x35, 0xbf, 0x02, 0x00,
0x00, 0x41, 0xff, 0xd6, 0x48, 0x8b, 0x35, 0x6d, 0x04, 0x00, 0x00, 0x48,
0x89, 0xdf, 0x48, 0x89, 0xc2, 0x41, 0xff, 0xd6, 0x48, 0x8b, 0x35, 0x65,
0x04, 0x00, 0x00, 0x48, 0x8d, 0x15, 0xce, 0x02, 0x00, 0x00, 0x48, 0x8d,
0x0d, 0xe7, 0x02, 0x00, 0x00, 0x48, 0x89, 0xc7, 0x41, 0xff, 0xd6, 0x48,
0x8b, 0x3d, 0x72, 0x04, 0x00, 0x00, 0x48, 0x8b, 0x35, 0x4b, 0x04, 0x00,
0x00, 0x48, 0x89, 0xc2, 0x41, 0xff, 0xd6, 0x48, 0x85, 0xc0, 0x74, 0x20,
0x48, 0x89, 0xc3, 0x48, 0x8b, 0x35, 0x3e, 0x04, 0x00, 0x00, 0x48, 0x89,
0xc7, 0xff, 0x15, 0x65, 0x02, 0x00, 0x00, 0x84, 0xc0, 0x74, 0x12, 0x48,
0x8d, 0x3d, 0xea, 0x02, 0x00, 0x00, 0xeb, 0x4d, 0x48, 0x8d, 0x3d, 0xc1,
0x02, 0x00, 0x00, 0xeb, 0x44, 0x48, 0x8b, 0x35, 0x20, 0x04, 0x00, 0x00,
0x48, 0x89, 0xdf, 0xff, 0x15, 0x3f, 0x02, 0x00, 0x00, 0x84, 0xc0, 0x74,
0x29, 0x48, 0x8b, 0x35, 0x14, 0x04, 0x00, 0x00, 0x48, 0x89, 0xdf, 0xff,
0x15, 0x2b, 0x02, 0x00, 0x00, 0x48, 0x89, 0x05, 0x6c, 0x04, 0x00, 0x00,
0x48, 0x8d, 0x3d, 0xed, 0x02, 0x00, 0x00, 0x31, 0xdb, 0x31, 0xc0, 0xe8,
0x2a, 0x00, 0x00, 0x00, 0xeb, 0x20, 0x48, 0x8d, 0x3d, 0xbb, 0x02, 0x00,
0x00, 0x31, 0xc0, 0xe8, 0x1a, 0x00, 0x00, 0x00, 0x48, 0x8d, 0x3d, 0xed,
0x02, 0x00, 0x00, 0x31, 0xc0, 0xe8, 0x0c, 0x00, 0x00, 0x00, 0x66, 0xbb,
0x02, 0x00, 0x0f, 0xb7, 0xc3, 0x5b, 0x41, 0x5e, 0x5d, 0xc3, 0xff, 0x25,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x48, 0x89, 0xe5,
0x41, 0x56, 0x53, 0x48, 0x8d, 0x3d, 0x02, 0x03, 0x00, 0x00, 0x31, 0xc0,
0xe8, 0x01, 0x01, 0x00, 0x00, 0x48, 0x8b, 0x1d, 0xcc, 0x04, 0x00, 0x00,
0x48, 0x8b, 0x3d, 0xcd, 0x04, 0x00, 0x00, 0x48, 0x8b, 0x35, 0x86, 0x04,
0x00, 0x00, 0x4c, 0x8b, 0x35, 0xcf, 0x02, 0x00, 0x00, 0x41, 0xff, 0xd6,
0x48, 0x8b, 0x35, 0x7d, 0x04, 0x00, 0x00, 0x48, 0x89, 0xdf, 0x48, 0x89,
0xc2, 0x41, 0xff, 0xd6, 0x48, 0x8b, 0x35, 0x75, 0x04, 0x00, 0x00, 0x48,
0x8d, 0x15, 0xde, 0x02, 0x00, 0x00, 0x48, 0x8d, 0x0d, 0xf7, 0x02, 0x00,
0x00, 0x48, 0x89, 0xc7, 0x41, 0xff, 0xd6, 0x48, 0x8b, 0x3d, 0x82, 0x04,
0x00, 0x00, 0x48, 0x8b, 0x35, 0x5b, 0x04, 0x00, 0x00, 0x48, 0x89, 0xc2,
0x41, 0xff, 0xd6, 0x48, 0x85, 0xc0, 0x74, 0x2b, 0x48, 0x89, 0xc3, 0x48,
0x8b, 0x35, 0x4e, 0x04, 0x00, 0x00, 0x48, 0x89, 0xc7, 0xff, 0x15, 0x75,
0x02, 0x00, 0x00, 0x84, 0xc0, 0x74, 0x28, 0x48, 0x8d, 0x3d, 0xfa, 0x02,
0x00, 0x00, 0x31, 0xc0, 0xe8, 0x79, 0x00, 0x00, 0x00, 0x66, 0xbb, 0x02,
0x00, 0xeb, 0x5c, 0x48, 0x8d, 0x3d, 0xc6, 0x02, 0x00, 0x00, 0x31, 0xc0,
0xe8, 0x65, 0x00, 0x00, 0x00, 0x66, 0xbb, 0x01, 0x00, 0xeb, 0x48, 0x48,
0x8b, 0x35, 0x1a, 0x04, 0x00, 0x00, 0x48, 0x89, 0xdf, 0xff, 0x15, 0x39,
0x02, 0x00, 0x00, 0x84, 0xc0, 0x74, 0x22, 0x48, 0x8b, 0x35, 0x0e, 0x04,
0x00, 0x00, 0x48, 0x89, 0xdf, 0xff, 0x15, 0x25, 0x02, 0x00, 0x00, 0x48,
0x89, 0x05, 0x66, 0x04, 0x00, 0x00, 0x48, 0x8d, 0x3d, 0xe7, 0x02, 0x00,
0x00, 0x31, 0xdb, 0xeb, 0x19, 0x48, 0x8d, 0x3d, 0xbc, 0x02, 0x00, 0x00,
0x31, 0xc0, 0xe8, 0x1b, 0x00, 0x00, 0x00, 0x66, 0xbb, 0x03, 0x00, 0x48,
0x8d, 0x3d, 0xea, 0x02, 0x00, 0x00, 0x31, 0xc0, 0xe8, 0x09, 0x00, 0x00,
0x00, 0x0f, 0xb7, 0xc3, 0x5b, 0x41, 0x5e, 0x5d, 0xc3, 0x90, 0xff, 0x25,
0xec, 0x01, 0x00, 0x00, 0x4c, 0x8d, 0x1d, 0xd5, 0x01, 0x00, 0x00, 0x41,
0x53, 0xff, 0x25, 0xc5, 0x01, 0x00, 0x00, 0x90, 0x68, 0x00, 0x00, 0x00,
0x00, 0xe9, 0xe6, 0xff, 0xff, 0xff, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x72,
Expand Down Expand Up @@ -336,8 +336,8 @@ unsigned char __src_osax_loader[] = {
0x6c, 0x61, 0x73, 0x73, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x20, 0x0d, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x27, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x10, 0x0d, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x26, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x00,
0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Expand Down Expand Up @@ -705,17 +705,17 @@ unsigned char __src_osax_loader[] = {
0x5f, 0x4e, 0x53, 0x4c, 0x6f, 0x67, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x5f, 0x00, 0x05, 0x00, 0x02, 0x79, 0x61, 0x62, 0x61, 0x69,
0x5f, 0x6f, 0x73, 0x61, 0x78, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x00, 0x1f,
0x4f, 0x42, 0x4a, 0x43, 0x5f, 0x00, 0x24, 0x03, 0x00, 0xa0, 0x1a, 0x00,
0x4f, 0x42, 0x4a, 0x43, 0x5f, 0x00, 0x24, 0x03, 0x00, 0x90, 0x1a, 0x00,
0x00, 0x02, 0x4d, 0x45, 0x54, 0x41, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f,
0x24, 0x5f, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x00, 0x4a, 0x43, 0x4c,
0x41, 0x53, 0x53, 0x5f, 0x24, 0x5f, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x72,
0x00, 0x4f, 0x03, 0x00, 0x88, 0x24, 0x00, 0x03, 0x00, 0xb0, 0x24, 0x00,
0x00, 0x00, 0x00, 0x00, 0xa0, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x90, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xe5, 0x00, 0x00, 0x00, 0x0e, 0x12, 0x00, 0x00, 0x58, 0x12, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0f, 0x11, 0x00, 0x00,
0x30, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
0x0f, 0x11, 0x00, 0x00, 0x08, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x30, 0x00, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x00, 0x20, 0x0d, 0x00, 0x00,
0x30, 0x00, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x00, 0x10, 0x0d, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Expand Down
Loading

0 comments on commit 6dedd58

Please sign in to comment.