From: AceVest Date: Wed, 9 Mar 2016 13:42:02 +0000 (+0800) Subject: hehe X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=a923938a45e3cb7328adfdf5b7d93b531916af38;p=acecode.git hehe --- diff --git a/.gitignore b/.gitignore index 1311e67..6522803 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.o +*.a *.out *.pyc ish diff --git a/beta/boot/multiboot.S b/beta/boot/multiboot.S index 79530f5..667c2a6 100644 --- a/beta/boot/multiboot.S +++ b/beta/boot/multiboot.S @@ -14,8 +14,6 @@ #define ASM #include -.section .init - .global BETA_ENTRY .extern kernel_end @@ -24,7 +22,7 @@ .text .code32 -.align 32 +.align 8 BETA_ENTRY: /* Reset eflags */ pushl $0 @@ -62,7 +60,7 @@ _loop: hlt jmp _loop -.align 32 +.align 8 /* Multiboot header. */ multiboot_header: magic: .long MULTIBOOT_HEADER_MAGIC diff --git a/beta/kernel/Makefile b/beta/kernel/Makefile index cda916e..2856d7e 100644 --- a/beta/kernel/Makefile +++ b/beta/kernel/Makefile @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -c -I../include -fno-builtin +CFLAGS = -m32 -c -I../include -fno-builtin CSOUCE_FILES = $(wildcard *.c) SSOUCE_FILES = $(wildcard *.S) diff --git a/beta/lib/csu/start.S b/beta/lib/csu/start.S index df70823..c4c7c85 100644 --- a/beta/lib/csu/start.S +++ b/beta/lib/csu/start.S @@ -7,10 +7,10 @@ * ------------------------------------------------------------------------ */ - .text - .global _start - .type _start, @function - _start: +.text +.code32 +.global _start +_start: nop diff --git a/beta/lib/libc/sysenter.S b/beta/lib/libc/sysenter.S index 91531a4..761279b 100644 --- a/beta/lib/libc/sysenter.S +++ b/beta/lib/libc/sysenter.S @@ -12,6 +12,7 @@ *-------------------------------------------------------------------------- */ .text +.code32 .global beta_sysenter beta_sysenter: diff --git a/documents/MySQLInjection.md b/documents/MySQLInjection.md index 125fdaf..aab15cf 100644 --- a/documents/MySQLInjection.md +++ b/documents/MySQLInjection.md @@ -1,4 +1,4 @@ -#MYSQL注入笔记 +# MYSQL注入总结 ##数据库信息 设数据库```security```里有如下```users```表。 @@ -110,7 +110,7 @@ if($row) { 其它与IntegerBased相似。如获取当前数据库的名字为```-1' UNION ALL SELECT NULL, DATABASE(), NULL AND '1'='``` -##构造SQL注入之三 +##构造SQL注入之三【GET - Blind - BoolianBased】 ###1.漏洞代码 ``` $id=$_GET['id']; diff --git a/tools/AceBox/AceBox.xcodeproj/project.pbxproj b/tools/AceBox/AceBox.xcodeproj/project.pbxproj index cf18b9f..792eba5 100644 --- a/tools/AceBox/AceBox.xcodeproj/project.pbxproj +++ b/tools/AceBox/AceBox.xcodeproj/project.pbxproj @@ -159,7 +159,8 @@ 50A4F26D1AF2154100DB7E36 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastSwiftUpdateCheck = 0720; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = Ace; TargetAttributes = { 50A4F2741AF2154100DB7E36 = { @@ -280,6 +281,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -349,6 +351,7 @@ INFOPLIST_FILE = AceBox/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -360,6 +363,7 @@ INFOPLIST_FILE = AceBox/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -378,6 +382,7 @@ ); INFOPLIST_FILE = AceBoxTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AceBox.app/AceBox"; }; @@ -393,6 +398,7 @@ ); INFOPLIST_FILE = AceBoxTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AceBox.app/AceBox"; }; diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate index 06b1c0f..f5fbf3a 100644 Binary files a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/tools/AceBox/AceBox.xcodeproj/xcuserdata/Ace.xcuserdatad/xcschemes/AceBox.xcscheme b/tools/AceBox/AceBox.xcodeproj/xcuserdata/Ace.xcuserdatad/xcschemes/AceBox.xcscheme index a6a831d..555fac5 100644 --- a/tools/AceBox/AceBox.xcodeproj/xcuserdata/Ace.xcuserdatad/xcschemes/AceBox.xcscheme +++ b/tools/AceBox/AceBox.xcodeproj/xcuserdata/Ace.xcuserdatad/xcschemes/AceBox.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:AceBox.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib index 903d8cb..152f073 100644 --- a/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib +++ b/tools/AceBox/AceBox/Base.lproj/LaunchScreen.xib @@ -1,7 +1,8 @@ - + - + + @@ -11,8 +12,8 @@ - @@ -56,15 +57,15 @@ - diff --git a/tools/AceBox/AceBox/FirstViewController.swift b/tools/AceBox/AceBox/FirstViewController.swift index 0b17823..27f6022 100644 --- a/tools/AceBox/AceBox/FirstViewController.swift +++ b/tools/AceBox/AceBox/FirstViewController.swift @@ -13,6 +13,7 @@ class FirstViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view, typically from a nib. + view.backgroundColor = UIColor.redColor() } override func didReceiveMemoryWarning() { diff --git a/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json index 9d284b1..0052e14 100644 --- a/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json @@ -63,6 +63,11 @@ "idiom" : "ipad", "filename" : "AceBoxIcon-76@2x.png", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/tools/AceBox/AceBox/Images.xcassets/first.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/first.imageset/Contents.json index 33a7451..215ee93 100644 --- a/tools/AceBox/AceBox/Images.xcassets/first.imageset/Contents.json +++ b/tools/AceBox/AceBox/Images.xcassets/first.imageset/Contents.json @@ -8,5 +8,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "original" } } \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/second.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/second.imageset/Contents.json index 03bd9c9..5acf838 100644 --- a/tools/AceBox/AceBox/Images.xcassets/second.imageset/Contents.json +++ b/tools/AceBox/AceBox/Images.xcassets/second.imageset/Contents.json @@ -8,5 +8,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "original" } } \ No newline at end of file diff --git a/tools/AceBox/AceBox/Info.plist b/tools/AceBox/AceBox/Info.plist index a8bf772..222ac74 100644 --- a/tools/AceBox/AceBox/Info.plist +++ b/tools/AceBox/AceBox/Info.plist @@ -3,11 +3,11 @@ CFBundleDevelopmentRegion - en + zh_CN CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.tencent.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tools/AceBox/AceBoxTests/Info.plist b/tools/AceBox/AceBoxTests/Info.plist index 82c8783..b9bb880 100644 --- a/tools/AceBox/AceBoxTests/Info.plist +++ b/tools/AceBox/AceBoxTests/Info.plist @@ -3,11 +3,11 @@ CFBundleDevelopmentRegion - en + zh_CN CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.tencent.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName