rhodes 3.4.2 → 3.5.1.12
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +9 -0
- data/Rakefile +61 -9
- data/doc/build.txt +147 -38
- data/doc/configuration.txt +49 -33
- data/doc/connect-to-web-services.txt +32 -32
- data/doc/contributing.txt +1 -1
- data/doc/device-caps.txt +62 -311
- data/doc/extensions.txt +104 -5
- data/doc/install.txt +17 -61
- data/doc/linea.txt +11 -11
- data/doc/nfc.txt +3 -3
- data/doc/release.txt +4 -4
- data/doc/rhom.txt +7 -7
- data/doc/rhostudio-test-plan.txt +12 -12
- data/doc/simulator.txt +32 -19
- data/doc/syncengine-ajax-api.txt +1 -1
- data/doc/synchronization.txt +8 -2
- data/doc/test-log-debug.txt +34 -3
- data/doc/ui.txt +8 -3
- data/installer/icon.ico +0 -0
- data/lib/build/jake.rb +27 -6
- data/lib/extensions/audiocapture/audiocapture.rb +43 -0
- data/lib/extensions/audiocapture/ext.yml +5 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/AndroidManifest.xml +10 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/Rakefile +77 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/ext_build.files +2 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/jni/src/audiocapture.cpp +189 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/src/com/audiocapture/Audiocapture.java +236 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/android/src/com/audiocapture/ExtAudioRecorder.java +573 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/Audiocapture.files +1 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/Rakefile +97 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/audiocapture.jdp +48 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/bb/src/com/audiocapture/Audiocapture.java +118 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Audiocapture.xcodeproj/project.pbxproj +314 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Audiocapture_Prefix.pch +7 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Classes/audioCapture.h +51 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Classes/audioCapture.m +418 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/iphone/Rakefile +79 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.sln +44 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.vcproj +647 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Audiocapture.vsprops +15 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/Rakefile +62 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/src/audiocapture_wm.cpp +40 -0
- data/lib/extensions/audiocapture/ext/audiocapture/platform/wm/src/audiocapture_wm.h +2 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/ruby/audiocapture.i +29 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/ruby/audiocapture_wrap.c +2310 -0
- data/lib/extensions/audiocapture/ext/audiocapture/shared/src/audiocapture.c +26 -0
- data/lib/extensions/audiocapture/ext/build +17 -0
- data/lib/extensions/audiocapture/ext/build.bat +36 -0
- data/lib/extensions/barcode/ext.yml +5 -3
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +87 -87
- data/lib/extensions/digest-md5/ext/build +1 -1
- data/lib/extensions/digest-sha1/ext/build +1 -1
- data/lib/extensions/digest-sha2/ext/build +1 -1
- data/lib/extensions/digest/ext/build +1 -1
- data/lib/extensions/fcntl/ext/fcntl.c +5 -5
- data/lib/extensions/gcm-push/ext.yml +8 -0
- data/lib/extensions/gcm-push/ext/android/AndroidManifest.rb +5 -0
- data/lib/extensions/gcm-push/ext/android/ApplicationManifestAdds.erb +8 -0
- data/lib/extensions/gcm-push/ext/android/Rakefile +66 -0
- data/lib/extensions/gcm-push/ext/android/ext_build.files +3 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/com_rhomobile_rhodes_gcm_GCMRhoListener.h +21 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.cpp +173 -0
- data/lib/extensions/gcm-push/ext/android/jni/src/gcmpushclient.h +62 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMBroadcastReceiver.java +40 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMFacade.java +55 -0
- data/lib/extensions/gcm-push/ext/android/src/com/rhomobile/rhodes/gcm/GCMIntentService.java +60 -0
- data/lib/extensions/gcm-push/ext/build +12 -0
- data/lib/extensions/gcm-push/ext/build.bat +8 -0
- data/lib/extensions/net-http/net/http.rb +153 -119
- data/lib/extensions/net-http/net/https.rb +4 -38
- data/lib/extensions/nfc/ext.yml +6 -4
- data/lib/extensions/nfc/ext/nfc/platform/android/jni/src/nfc.cpp +2 -2
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java +0 -1
- data/lib/extensions/openssl/openssl/ssl-internal.rb +3 -1
- data/lib/extensions/rawsensors/ext.yml +4 -0
- data/lib/extensions/rawsensors/ext/build +17 -0
- data/lib/extensions/rawsensors/ext/build.bat +36 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/Rakefile +77 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/ext_build.files +1 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/jni/src/rawsensors.cpp +180 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/android/src/com/rawsensors/Rawsensors.java +355 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/Rakefile +97 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/Rawsensors.files +1 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/rawsensors.jdp +48 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/bb/src/com/rawsensors/Rawsensors.java +118 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Classes/RawSensors.h +66 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Classes/RawSensors.m +351 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rakefile +79 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rawsensors.xcodeproj/project.pbxproj +316 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/iphone/Rawsensors_Prefix.pch +7 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rakefile +62 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.sln +44 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.vcproj +647 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/Rawsensors.vsprops +15 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/src/rawsensors_wm.cpp +40 -0
- data/lib/extensions/rawsensors/ext/rawsensors/platform/wm/src/rawsensors_wm.h +2 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/ruby/rawsensors.i +22 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/ruby/rawsensors_wrap.c +2308 -0
- data/lib/extensions/rawsensors/ext/rawsensors/shared/src/rawsensors.c +25 -0
- data/lib/extensions/rawsensors/rawsensors.rb +36 -0
- data/lib/framework/autocomplete/AddressBar.rb +19 -0
- data/lib/framework/autocomplete/Alarm.rb +23 -0
- data/lib/framework/autocomplete/Alert.rb +19 -0
- data/lib/framework/autocomplete/AppApplication.rb +17 -0
- data/lib/framework/autocomplete/AppSwitcher.rb +13 -0
- data/lib/framework/autocomplete/Application.rb +23 -0
- data/lib/framework/autocomplete/AudioCapture.rb +31 -0
- data/lib/framework/autocomplete/BackButton.rb +25 -0
- data/lib/framework/autocomplete/Backlight.rb +21 -0
- data/lib/framework/autocomplete/Barcode.rb +29 -0
- data/lib/framework/autocomplete/BasicSocket.rb +87 -0
- data/lib/framework/autocomplete/Battery.rb +33 -0
- data/lib/framework/autocomplete/BottomCommandArea.rb +19 -0
- data/lib/framework/autocomplete/BrowserHelper.rb +19 -0
- data/lib/framework/autocomplete/Bsearch.rb +11 -0
- data/lib/framework/autocomplete/Camera.rb +17 -0
- data/lib/framework/autocomplete/CardReader.rb +29 -0
- data/lib/framework/autocomplete/Comm.rb +45 -0
- data/lib/framework/autocomplete/Cradle.rb +15 -0
- data/lib/framework/autocomplete/Date.rb +50 -0
- data/lib/framework/autocomplete/DateTime.rb +24 -0
- data/lib/framework/autocomplete/DateTimePicker.rb +15 -0
- data/lib/framework/autocomplete/Device.rb +19 -0
- data/lib/framework/autocomplete/Digest.rb +28 -0
- data/lib/framework/autocomplete/Dir.rb +63 -0
- data/lib/framework/autocomplete/Eink.rb +19 -0
- data/lib/framework/autocomplete/EmmlProfile.rb +19 -0
- data/lib/framework/autocomplete/File.rb +301 -0
- data/lib/framework/autocomplete/FileTransfer.rb +27 -0
- data/lib/framework/autocomplete/ForwardButton.rb +25 -0
- data/lib/framework/autocomplete/GeneratorController.rb +15 -0
- data/lib/framework/autocomplete/GeoLocation.rb +27 -0
- data/lib/framework/autocomplete/Gesture.rb +71 -0
- data/lib/framework/autocomplete/GoButton.rb +25 -0
- data/lib/framework/autocomplete/HashWithIndifferentAccess.rb +51 -0
- data/lib/framework/autocomplete/History.rb +11 -0
- data/lib/framework/autocomplete/HomeButton.rb +25 -0
- data/lib/framework/autocomplete/Hourglass.rb +17 -0
- data/lib/framework/autocomplete/IPSocket.rb +65 -0
- data/lib/framework/autocomplete/Imager.rb +53 -0
- data/lib/framework/autocomplete/IoAnalog.rb +73 -0
- data/lib/framework/autocomplete/IoDigital.rb +93 -0
- data/lib/framework/autocomplete/IoSystem.rb +21 -0
- data/lib/framework/autocomplete/JSON.rb +142 -0
- data/lib/framework/autocomplete/KeyCapture.rb +25 -0
- data/lib/framework/autocomplete/KeyState.rb +23 -0
- data/lib/framework/autocomplete/Keylight.rb +17 -0
- data/lib/framework/autocomplete/Lightsensor.rb +19 -0
- data/lib/framework/autocomplete/LocalizationSimplified.rb +33 -0
- data/lib/framework/autocomplete/MapView.rb +23 -0
- data/lib/framework/autocomplete/MediaPlayer.rb +19 -0
- data/lib/framework/autocomplete/Memory.rb +17 -0
- data/lib/framework/autocomplete/MinimizeButton.rb +25 -0
- data/lib/framework/autocomplete/NativeBar.rb +31 -0
- data/lib/framework/autocomplete/NavBar.rb +15 -0
- data/lib/framework/autocomplete/Network.rb +31 -0
- data/lib/framework/autocomplete/Notification.rb +35 -0
- data/lib/framework/autocomplete/OpenSSL.rb +440 -0
- data/lib/framework/autocomplete/Phonebook.rb +39 -0
- data/lib/framework/autocomplete/PowerOn.rb +13 -0
- data/lib/framework/autocomplete/Push.rb +27 -0
- data/lib/framework/autocomplete/QuitButton.rb +25 -0
- data/lib/framework/autocomplete/RHO_APPS_DIR.rb +8 -0
- data/lib/framework/autocomplete/RHO_ERB_EXT.rb +8 -0
- data/lib/framework/autocomplete/RHO_FRAMEWORK.rb +0 -0
- data/lib/framework/autocomplete/RHO_RB_EXT.rb +8 -0
- data/lib/framework/autocomplete/RawSensors.rb +53 -0
- data/lib/framework/autocomplete/Reboot.rb +13 -0
- data/lib/framework/autocomplete/Registry.rb +25 -0
- data/lib/framework/autocomplete/ReloadButton.rb +25 -0
- data/lib/framework/autocomplete/Rfid.rb +173 -0
- data/lib/framework/autocomplete/Rho.rb +496 -0
- data/lib/framework/autocomplete/RhoBluetooth.rb +41 -0
- data/lib/framework/autocomplete/RhoConf.rb +23 -0
- data/lib/framework/autocomplete/RhoElementsExt.rb +11 -0
- data/lib/framework/autocomplete/RhoLog.rb +13 -0
- data/lib/framework/autocomplete/RhoProfiler.rb +21 -0
- data/lib/framework/autocomplete/RhoStdout.rb +19 -0
- data/lib/framework/autocomplete/Rhodes.rb +13 -0
- data/lib/framework/autocomplete/RhodesNativeViewManager.rb +15 -0
- data/lib/framework/autocomplete/Rhom.rb +198 -0
- data/lib/framework/autocomplete/Rsm.rb +135 -0
- data/lib/framework/autocomplete/SQLite3.rb +36 -0
- data/lib/framework/autocomplete/SWIG.rb +24 -0
- data/lib/framework/autocomplete/ScanError.rb +9 -0
- data/lib/framework/autocomplete/Scanner.rb +379 -0
- data/lib/framework/autocomplete/ScreenOrientation.rb +23 -0
- data/lib/framework/autocomplete/SignatureCapture.rb +47 -0
- data/lib/framework/autocomplete/SignatureTool.rb +11 -0
- data/lib/framework/autocomplete/Sip.rb +19 -0
- data/lib/framework/autocomplete/SipButton.rb +25 -0
- data/lib/framework/autocomplete/Sntp.rb +13 -0
- data/lib/framework/autocomplete/Socket.rb +356 -0
- data/lib/framework/autocomplete/SocketError.rb +9 -0
- data/lib/framework/autocomplete/StopButton.rb +25 -0
- data/lib/framework/autocomplete/StringIO.rb +139 -0
- data/lib/framework/autocomplete/StringScanner.rb +102 -0
- data/lib/framework/autocomplete/Stylus.rb +15 -0
- data/lib/framework/autocomplete/SyncEngine.rb +77 -0
- data/lib/framework/autocomplete/System.rb +79 -0
- data/lib/framework/autocomplete/SystemTime.rb +17 -0
- data/lib/framework/autocomplete/TCPServer.rb +65 -0
- data/lib/framework/autocomplete/TCPSocket.rb +59 -0
- data/lib/framework/autocomplete/Telemetry.rb +23 -0
- data/lib/framework/autocomplete/Thread.rb +85 -0
- data/lib/framework/autocomplete/Time.rb +167 -0
- data/lib/framework/autocomplete/Timer.rb +19 -0
- data/lib/framework/autocomplete/TopCommandArea.rb +19 -0
- data/lib/framework/autocomplete/UDPSocket.rb +65 -0
- data/lib/framework/autocomplete/VideoCapture.rb +29 -0
- data/lib/framework/autocomplete/Volume.rb +13 -0
- data/lib/framework/autocomplete/Wake.rb +15 -0
- data/lib/framework/autocomplete/WebView.rb +31 -0
- data/lib/framework/autocomplete/Wlan.rb +87 -0
- data/lib/framework/autocomplete/Zoom.rb +15 -0
- data/lib/framework/autocomplete/ZoomInPageButton.rb +25 -0
- data/lib/framework/autocomplete/ZoomOutPageButton.rb +25 -0
- data/lib/framework/autocomplete/ZoomTextButton.rb +25 -0
- data/lib/framework/rho/render.rb +15 -4
- data/lib/framework/rho/rho.rb +17 -8
- data/lib/framework/rho/rhoapplication.rb +25 -3
- data/lib/framework/rho/rhocontact.rb +13 -0
- data/lib/framework/rho/rhoevent.rb +15 -0
- data/lib/framework/rho/rhonativeviewmanager.rb +3 -3
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rhom/rhom.rb +5 -0
- data/lib/framework/rhomotoapi.rb +2 -1
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +4 -3
- data/platform/android/Rhodes/AndroidManifest.xml.erb +7 -7
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +22 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +1 -9
- data/platform/android/Rhodes/jni/src/callbacks.cpp +2 -0
- data/platform/android/Rhodes/jni/src/camera.cpp +5 -0
- data/platform/android/Rhodes/jni/src/event.cpp +10 -0
- data/platform/android/Rhodes/jni/src/geolocation.cpp +10 -0
- data/platform/android/Rhodes/jni/src/logger.cpp +3 -1
- data/platform/android/Rhodes/jni/src/phonebook.cpp +11 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +1 -1
- data/platform/android/Rhodes/jni/src/rhodesapp.cpp +41 -25
- data/platform/android/Rhodes/jni/src/signature.cpp +7 -6
- data/platform/android/Rhodes/jni/src/webview.cpp +29 -0
- data/platform/android/Rhodes/project.properties +1 -1
- data/platform/android/Rhodes/res/drawable/icon.png +0 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ConnectionChangeReceiver.java +28 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushContract.java +102 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +20 -56
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +9 -124
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +114 -126
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java +3 -5
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +31 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +2 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +3 -7
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProvider.java +19 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderFroyo.java +5 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/CalendarIDsProviderICS.java +22 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +32 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoExtension.java +5 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/AbstractRhoListener.java +34 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtManager.java +11 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoExtension.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{webview → extmanager}/IRhoWebView.java +5 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java +605 -492
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +16 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +9 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +43 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SplashScreen.java +82 -64
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +28 -13
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +4 -4
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +0 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java +4 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java +7 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality12.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality13.java +6 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality14.java +12 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java +10 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +3 -6
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +1 -1
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java +43 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebChromeClient.java +5 -0
- data/platform/android/build/RhodesSRC_build.files +10 -4
- data/platform/android/build/android.rake +46 -193
- data/platform/android/build/android_tools.rb +181 -13
- data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java +3 -3
- data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java +4 -2
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +2 -0
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +6 -0
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +13 -8
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +103 -1
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +18 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +9 -2
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +16 -11
- data/platform/bb/RubyVM/src/com/rho/sync/ClientRegister.java +25 -3
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.java +1 -1
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +122 -32
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +44 -14
- data/platform/bb/RubyVM/src/com/rho/sync/SyncProtocol_3.java +3 -2
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +340 -88
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +62 -15
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/AttrReader.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFixnum.java +3 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyHash.java +1 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java +19 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBasic.java +9 -0
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBinding.java +4 -4
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyModule.java +13 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyObject.java +16 -1
- data/platform/bb/build/bb.rake +3 -1
- data/platform/bb/build/rhodes_build.files +0 -1
- data/platform/bb/rhodes/platform/4.7/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +13 -3
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/platform/common/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/resources/icon.png +0 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +10 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +13 -3
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +5 -0
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +1 -1
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +6 -1
- data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java +6 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +38 -9
- data/platform/bb/rhodes/src/com/rho/rubyext/SignatureCapture.java +13 -18
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +16 -1
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +0 -20
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +1 -10
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +40 -35
- data/platform/iphone/Classes/AppManager/AppManager.h +1 -1
- data/platform/iphone/Classes/AppManager/AppManager.m +46 -29
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +9 -0
- data/platform/iphone/Classes/Event/Event.h +6 -1
- data/platform/iphone/Classes/Event/Event.m +67 -1
- data/platform/iphone/Classes/GeoLocation/LocationController.h +2 -1
- data/platform/iphone/Classes/GeoLocation/LocationController.m +17 -1
- data/platform/iphone/Classes/NetworkStatusMonitor.h +17 -0
- data/platform/iphone/Classes/NetworkStatusMonitor.mm +58 -0
- data/platform/iphone/Classes/Phonebook/phonebook.h +6 -0
- data/platform/iphone/Classes/Phonebook/phonebook.m +62 -6
- data/platform/iphone/Classes/Reachability.h +31 -0
- data/platform/iphone/Classes/Reachability.m +223 -0
- data/platform/iphone/Classes/RhoMainView.h +1 -0
- data/platform/iphone/Classes/RhoViewController.m +16 -0
- data/platform/iphone/Classes/Rhodes.h +2 -0
- data/platform/iphone/Classes/Rhodes.m +89 -10
- data/platform/iphone/Classes/Signature/SignatureDelegate.m +4 -7
- data/platform/iphone/Classes/SimpleMainView.m +16 -0
- data/platform/iphone/Classes/SplashViewController.m +11 -1
- data/platform/iphone/Classes/SplitView/RightViewController.m +6 -0
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +5 -0
- data/platform/iphone/Classes/TabbedMainView.m +4 -0
- data/platform/iphone/Classes/WebView.m +14 -0
- data/platform/iphone/Info.plist +1 -6
- data/platform/iphone/iTunesArtwork.jpg +0 -0
- data/platform/iphone/icon.png +0 -0
- data/platform/iphone/icon114.png +0 -0
- data/platform/iphone/icon57.png +0 -0
- data/platform/iphone/icon72.png +0 -0
- data/platform/iphone/rbuild/iphone.rake +8 -11
- data/platform/iphone/rhorunner.xcodeproj/project.pbxproj +20 -4
- data/platform/osx/Rhodes Launcher/rhorunner.app/icon.png +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +1 -1
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqcorewlanbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtga.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_inspector.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libqmldbg_tcp.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/rho.icns +0 -0
- data/platform/shared/common/ExtManager.h +8 -0
- data/platform/shared/common/RhoDefs.h +3 -2
- data/platform/shared/common/RhoFile.cpp +14 -1
- data/platform/shared/common/RhoMutexLock.h +4 -0
- data/platform/shared/common/RhoPort.h +5 -1
- data/platform/shared/common/RhoStd.h +12 -0
- data/platform/shared/common/RhoThread.cpp +1 -2
- data/platform/shared/common/RhoTime.h +4 -0
- data/platform/shared/common/RhodesApp.cpp +189 -65
- data/platform/shared/common/RhodesApp.h +60 -7
- data/platform/shared/common/RhodesAppBase.cpp +2 -8
- data/platform/shared/common/RhodesAppBase.h +1 -0
- data/platform/shared/common/ThreadQueue.cpp +2 -2
- data/platform/shared/common/app_build_configs.c +3 -1
- data/platform/shared/common/map/MapEngine.cpp +39 -3
- data/platform/shared/common/push/IRhoPushClient.h +3 -3
- data/platform/shared/common/push/RhoPushManager.cpp +31 -53
- data/platform/shared/common/push/RhoPushManager.h +12 -26
- data/platform/shared/curl/lib/curl_config.h +1 -1
- data/platform/shared/json/RJSONTokener.c +3 -1
- data/platform/shared/json/config.h +4 -4
- data/platform/shared/json/json_tokener.c +1 -1
- data/platform/shared/logging/RhoLog.cpp +5 -5
- data/platform/shared/logging/RhoLogConf.cpp +4 -6
- data/platform/shared/logging/RhoLogConf.h +2 -2
- data/platform/shared/logging/RhoLogSink.cpp +2 -0
- data/platform/shared/net/HttpServer.cpp +54 -7
- data/platform/shared/net/HttpServer.h +2 -0
- data/platform/shared/qt/rhodes/QtMainWindow.cpp +22 -0
- data/platform/shared/qt/rhodes/QtMainWindow.h +1 -0
- data/platform/shared/qt/rhodes/impl/CalendarImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/CameraImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/GeoLocationImpl.cpp +6 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp +7 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.h +2 -0
- data/platform/shared/qt/rhodes/impl/PhonebookImpl.cpp +4 -0
- data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +5 -0
- data/platform/shared/qt/rhodes/impl/WebViewImpl.cpp +12 -0
- data/platform/shared/qt/rhodes/main.cpp +0 -7
- data/platform/shared/qt/rhodes/resources/rho.icns +0 -0
- data/platform/shared/qt/rhodes/resources/rho.ico +0 -0
- data/platform/shared/qt/rhodes/resources/rho.png +0 -0
- data/platform/shared/ruby/encoding.c +4 -0
- data/platform/shared/ruby/ext/calendar/calendar.i +3 -0
- data/platform/shared/ruby/ext/calendar/calendar_wrap.c +19 -0
- data/platform/shared/ruby/ext/camera/camera.i +2 -0
- data/platform/shared/ruby/ext/camera/camera_wrap.c +43 -2
- data/platform/shared/ruby/ext/geolocation/geolocation.i +4 -0
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +24 -4
- data/platform/shared/ruby/ext/phonebook/phonebook.i +4 -0
- data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +44 -0
- data/platform/shared/ruby/ext/rho/extensions.c +0 -2
- data/platform/shared/ruby/ext/rho/rhoruby.c +2 -0
- data/platform/shared/ruby/ext/rho/rhosupport.c +8 -0
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +1 -1
- data/platform/shared/ruby/ext/syncengine/syncengine.i +6 -2
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +19 -6
- data/platform/shared/ruby/ext/system/system.i +22 -0
- data/platform/shared/ruby/ext/system/system_wrap.c +158 -86
- data/platform/shared/ruby/ext/webview/webview.i +13 -8
- data/platform/shared/ruby/ext/webview/webview_wrap.c +88 -2
- data/platform/shared/ruby/include/ruby/win32.h +3 -1
- data/platform/shared/ruby/iphone/ruby/config.h +3 -3
- data/platform/shared/ruby/missing/hypot.c +4 -0
- data/platform/shared/ruby/random.c +6 -2
- data/platform/shared/ruby/thread_win32.c +8 -3
- data/platform/shared/ruby/win32/ruby/config.h +0 -3
- data/platform/shared/ruby/win32/win32.c +4 -0
- data/platform/shared/ruby/wp8/assert.c +12 -0
- data/platform/shared/ruby/wp8/assert.h +18 -0
- data/platform/shared/ruby/wp8/errno.c +11 -0
- data/platform/shared/ruby/wp8/errno.h +59 -0
- data/platform/shared/ruby/wp8/missing_wp8.h +74 -0
- data/platform/shared/ruby/wp8/signal.h +71 -0
- data/platform/shared/ruby/wp8/signal_wp8.c +26 -0
- data/platform/shared/ruby/wp8/stdio.c +36 -0
- data/platform/shared/ruby/wp8/stdlib.c +61 -0
- data/platform/shared/ruby/wp8/string_wp8.c +89 -0
- data/platform/shared/ruby/wp8/sys/stat.c +183 -0
- data/platform/shared/ruby/wp8/sys/stat.h +70 -0
- data/platform/shared/ruby/wp8/sys/timeb.c +31 -0
- data/platform/shared/ruby/wp8/sys/timeb.h +27 -0
- data/platform/shared/ruby/wp8/sys/types.h +62 -0
- data/platform/shared/ruby/wp8/sys/utime.c +44 -0
- data/platform/shared/ruby/wp8/sys/utime.h +27 -0
- data/platform/shared/ruby/wp8/time_wp8.c +256 -0
- data/platform/shared/ruby/wp8/varargs.h +34 -0
- data/platform/shared/ruby/wp8/win32/win32.c +5783 -0
- data/platform/shared/ruby/wp8/winsock_wp8.c +26 -0
- data/platform/shared/ruby/wp8/winsock_wp8.h +23 -0
- data/platform/shared/ruby/wp8/wp8.c +516 -0
- data/platform/shared/ruby/wp8/wp8.h +274 -0
- data/platform/shared/ruby/wp8/wp8main.c +18 -0
- data/platform/shared/rubyext/GeoLocation.cpp +1 -1
- data/platform/shared/rubyext/System.cpp +18 -4
- data/platform/shared/rubyext/ZipFiles.cpp +1 -1
- data/platform/shared/sync/ClientRegister.cpp +113 -23
- data/platform/shared/sync/ClientRegister.h +27 -16
- data/platform/shared/sync/ILoginListener.h +44 -0
- data/platform/shared/sync/SyncEngine.cpp +50 -24
- data/platform/shared/sync/SyncEngine.h +11 -5
- data/platform/shared/sync/SyncSource.cpp +87 -61
- data/platform/shared/sync/SyncSource.h +6 -3
- data/platform/shared/sync/SyncThread.cpp +8 -15
- data/platform/shared/sync/SyncThread.h +13 -7
- data/platform/shared/unzip/unzip.cpp +1 -1
- data/platform/shared/unzip/zip.h +8 -1
- data/platform/shared/xruby/src/com/xruby/runtime/builtin/AttrReader.java +13 -0
- data/platform/shared/xruby/src/com/xruby/runtime/builtin/RubyFixnum.java +3 -1
- data/platform/shared/xruby/src/com/xruby/runtime/lang/MethodBlockBase.java +9 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyBasic.java +9 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyBinding.java +17 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyMethod.java +22 -2
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyModule.java +25 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyObject.java +21 -0
- data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyValue.java +8 -0
- data/platform/symbian/rhodes/src/phonebook/ruby_phonebook.cpp +6 -0
- data/platform/win32/RhoSimulator/Microsoft.VC90.CRT.manifest +12 -5
- data/platform/win32/RhoSimulator/Microsoft.VC90.OpenMP.manifest +12 -5
- data/platform/win32/RhoSimulator/QtCore4.dll +0 -0
- data/platform/win32/RhoSimulator/QtGui4.dll +0 -0
- data/platform/win32/RhoSimulator/QtNetwork4.dll +0 -0
- data/platform/win32/RhoSimulator/QtWebKit4.dll +0 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/RhoSimulator/imageformats/qgif4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qico4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qjpeg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qmng4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qsvg4.dll +0 -0
- data/platform/win32/RhoSimulator/imageformats/qtiff4.dll +0 -0
- data/platform/win32/RhoSimulator/msvcm90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcp90.dll +0 -0
- data/platform/win32/RhoSimulator/msvcr90.dll +0 -0
- data/platform/win32/RhoSimulator/phonon4.dll +0 -0
- data/platform/win32/RhoSimulator/vcomp90.dll +0 -0
- data/platform/wm/build/wm.rake +67 -22
- data/platform/wm/rhodes.sln +485 -493
- data/platform/wm/rhodes/IEBrowserEngine.cpp +2 -6
- data/platform/wm/rhodes/MainWindow.cpp +86 -35
- data/platform/wm/rhodes/MainWindow.h +33 -0
- data/platform/wm/rhodes/Rhodes.cpp +288 -215
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +22 -17
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +3 -3
- data/platform/wm/rhodes/camera/Camera.cpp +4 -0
- data/platform/wm/rhodes/camera/Camera.h +1 -0
- data/platform/wm/rhodes/phonebook/phonebook.cpp +9 -0
- data/platform/wm/rhodes/phonebook/phonebook.h +2 -0
- data/platform/wm/rhodes/resources/icon.ico +0 -0
- data/platform/wm/rhodes/rho/common/ExtManager.cpp +5 -1
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +1 -11
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +5 -0
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +21 -2
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +12 -0
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +9 -0
- data/platform/wm/rhodes/rhodes.vcproj +60 -60
- data/platform/wm/rhodes/simulator/MainWindowQt.cpp +91 -6
- data/platform/wm/rhodes/simulator/MainWindowQt.h +6 -0
- data/platform/wm/rhoelements.sln +624 -623
- data/platform/wm/tcmalloc/tcmalloc.vcproj +1230 -1070
- data/platform/wp7/RhoRubyLib/rubyext/RhoCamera.cs +6 -3
- data/platform/wp7/rhodes/Properties/WMAppManifest.xml +5 -0
- data/platform/wp7/rhodes/icon.png +0 -0
- data/platform/wp8/RhoAppRunner/Program.cs +99 -0
- data/platform/wp8/RhoAppRunner/Properties/AssemblyInfo.cs +36 -0
- data/platform/wp8/RhoAppRunner/RhoAppRunner.csproj +69 -0
- data/platform/wp8/build/wp.rake +486 -0
- data/platform/wp8/rhodes.sln +154 -0
- data/platform/wp8/rhodes/App.xaml +20 -0
- data/platform/wp8/rhodes/App.xaml.cs +189 -0
- data/platform/wp8/rhodes/Assets/ApplicationIcon.png +0 -0
- data/platform/wp8/rhodes/Assets/Tiles/FlipCycleTileMedium.png +0 -0
- data/platform/wp8/rhodes/Assets/Tiles/FlipCycleTileSmall.png +0 -0
- data/platform/wp8/rhodes/LocalizedStrings.cs +37 -0
- data/platform/wp8/rhodes/MainPage.xaml +21 -0
- data/platform/wp8/rhodes/MainPage.xaml.cs +339 -0
- data/platform/wp8/rhodes/Properties/AppManifest.xml +6 -0
- data/platform/wp8/rhodes/Properties/AssemblyInfo.cs +37 -0
- data/platform/wp8/rhodes/Properties/WMAppManifest.xml +47 -0
- data/platform/wp8/rhodes/Resources/AppResources.Designer.cs +127 -0
- data/platform/wp8/rhodes/Resources/AppResources.resx +135 -0
- data/platform/wp8/rhodes/common/IInputStream.cs +47 -0
- data/platform/wp8/rhodes/common/RhoFile.cs +374 -0
- data/platform/wp8/rhodes/common/RhoFilePath.cs +115 -0
- data/platform/wp8/rhodes/common/RhoResourceMap.cs +92 -0
- data/platform/wp8/rhodes/common/RhoStd.cs +237 -0
- data/platform/wp8/rhodes/icon.png +0 -0
- data/platform/wp8/rhodes/rhodes.csproj +198 -0
- data/platform/wp8/rholib/rholib.vcxproj +240 -0
- data/platform/wp8/rholib/rholib.vcxproj.filters +289 -0
- data/platform/wp8/rhoruntime/FakeDefs.cpp +134 -0
- data/platform/wp8/rhoruntime/common/ExtManager.cpp +449 -0
- data/platform/wp8/rhoruntime/common/RhoClassFactory.cpp +58 -0
- data/platform/wp8/rhoruntime/common/RhoClassFactory.h +60 -0
- data/platform/wp8/rhoruntime/common/RhoCryptImpl.cpp +274 -0
- data/platform/wp8/rhoruntime/common/RhoCryptImpl.h +78 -0
- data/platform/wp8/rhoruntime/common/RhoThreadImpl.cpp +109 -0
- data/platform/wp8/rhoruntime/common/RhoThreadImpl.h +56 -0
- data/platform/wp8/rhoruntime/pch_rhoruntime.cpp +27 -0
- data/platform/wp8/rhoruntime/pch_rhoruntime.h +30 -0
- data/platform/wp8/rhoruntime/rhoruntime.cpp +93 -0
- data/platform/wp8/rhoruntime/rhoruntime.h +114 -0
- data/platform/wp8/rhoruntime/rhoruntime.vcxproj +175 -0
- data/platform/wp8/rhoruntime/rhoruntime.vcxproj.filters +44 -0
- data/platform/wp8/rubylib/file.c +5459 -0
- data/platform/wp8/rubylib/rubylib.vcxproj +286 -0
- data/platform/wp8/rubylib/rubylib.vcxproj.filters +307 -0
- data/platform/wp8/sqlite3/crypto.c +933 -0
- data/platform/wp8/sqlite3/sqlite3.c +136332 -0
- data/platform/wp8/sqlite3/sqlite3.vcxproj +149 -0
- data/platform/wp8/sqlite3/sqlite3.vcxproj.filters +16 -0
- data/platform/wp8/syncengine/syncengine.vcxproj +199 -0
- data/platform/wp8/syncengine/syncengine.vcxproj.filters +155 -0
- data/rakefile.rb +61 -9
- data/res/build-tools/RhoAppRunnerWP8.exe +0 -0
- data/res/build-tools/license_rc.dll +0 -0
- data/res/build-tools/win32/license_rc.dll +0 -0
- data/res/build-tools/xruby-0.3.3.jar +0 -0
- data/res/generators/rhogen.rb +36 -0
- data/res/generators/templates/application/app/loading-568h@2x.png +0 -0
- data/res/generators/templates/application/app/loading-Landscape.png +0 -0
- data/res/generators/templates/application/app/loading-LandscapeLeft.png +0 -0
- data/res/generators/templates/application/app/loading-LandscapeRight.png +0 -0
- data/res/generators/templates/application/app/loading-Portrait.png +0 -0
- data/res/generators/templates/application/app/loading-PortraitUpsideDown.png +0 -0
- data/res/generators/templates/application/app/loading.png +0 -0
- data/res/generators/templates/application/app/loading@2x.png +0 -0
- data/res/generators/templates/application/icon/icon.ico +0 -0
- data/res/generators/templates/application/icon/icon.png +0 -0
- data/res/generators/templates/application/icon/icon114.png +0 -0
- data/res/generators/templates/application/icon/icon57.png +0 -0
- data/res/generators/templates/application/icon/icon72.png +0 -0
- data/res/generators/templates/application/public/css/android.css +1 -1
- data/res/generators/templates/application/public/jqmobile/images/icon-search-black.png +0 -0
- data/res/generators/templates/application/rhoconfig.txt +3 -1
- data/res/generators/templates/model/model.rb +1 -1
- data/res/icons/rho.icns +0 -0
- data/res/icons/rho.ico +0 -0
- data/res/icons/rho.png +0 -0
- data/res/icons/rhodes.icns +0 -0
- data/res/icons/rhodes.ico +0 -0
- data/res/icons/rhodes.png +0 -0
- data/res/icons/rhosim.icns +0 -0
- data/res/icons/rhosim.ico +0 -0
- data/res/icons/rhosim.png +0 -0
- data/res/libs/motorolalicence/android/MotorolaLicence.h +2 -1
- data/res/libs/motorolalicence/android/libMotorolaLicence.a +0 -0
- data/res/libs/motorolalicence/iphone/MotorolaLicence.h +2 -1
- data/res/libs/motorolalicence/iphone/libMotorolaLicence.a +0 -0
- data/spec/autocomplete_generator/Rakefile +37 -0
- data/spec/autocomplete_generator/app/Generator/controller.rb +40 -0
- data/spec/autocomplete_generator/app/Generator/generator.rb +236 -0
- data/spec/autocomplete_generator/app/Generator/index.erb +21 -0
- data/spec/autocomplete_generator/app/Settings/controller.rb +117 -0
- data/spec/autocomplete_generator/app/Settings/err_sync.erb +11 -0
- data/spec/autocomplete_generator/app/Settings/home.bb.erb +18 -0
- data/spec/autocomplete_generator/app/Settings/home.erb +19 -0
- data/spec/autocomplete_generator/app/Settings/index.bb.erb +31 -0
- data/spec/autocomplete_generator/app/Settings/index.erb +31 -0
- data/spec/autocomplete_generator/app/Settings/login.bb.erb +29 -0
- data/spec/autocomplete_generator/app/Settings/login.erb +25 -0
- data/spec/autocomplete_generator/app/Settings/reset.bb.erb +16 -0
- data/spec/autocomplete_generator/app/Settings/reset.erb +14 -0
- data/spec/autocomplete_generator/app/Settings/wait.bb.erb +10 -0
- data/spec/autocomplete_generator/app/Settings/wait.erb +10 -0
- data/spec/autocomplete_generator/app/application.rb +16 -0
- data/spec/autocomplete_generator/app/helpers/application_helper.rb +129 -0
- data/spec/autocomplete_generator/app/helpers/browser_helper.rb +22 -0
- data/spec/autocomplete_generator/app/index.bb.erb +21 -0
- data/spec/autocomplete_generator/app/index.erb +24 -0
- data/spec/autocomplete_generator/app/layout.erb +94 -0
- data/spec/autocomplete_generator/app/loading.html +11 -0
- data/spec/autocomplete_generator/build.yml +41 -0
- data/spec/autocomplete_generator/icon/icon.ico +0 -0
- data/spec/autocomplete_generator/icon/icon.png +0 -0
- data/spec/autocomplete_generator/icon/icon.svg +5334 -0
- data/spec/autocomplete_generator/icon/icon114.png +0 -0
- data/spec/autocomplete_generator/icon/icon57.png +0 -0
- data/spec/autocomplete_generator/icon/icon72.png +0 -0
- data/spec/autocomplete_generator/readme.txt +1 -0
- data/spec/autocomplete_generator/rhoconfig.txt +88 -0
- data/spec/autocomplete_generator/rhosimulator/Databases/Databases.db +0 -0
- data/spec/autocomplete_generator/rhosimulator/WebpageIcons.db +0 -0
- data/spec/autocomplete_generator/rhosimulator/db/syncdbuser.sqlite +0 -0
- data/spec/autocomplete_generator/rhosimulator/db/syncdbuser.sqlite.version +1 -0
- data/spec/autocomplete_generator/rhosimulator/rholog.txt_pos +1 -0
- data/spec/autocomplete_generator/rhosimulator/rhosimconfig.txt +8 -0
- data/spec/framework_spec/app/spec/rhomobile/NetHttp_spec.rb +22 -0
- data/spec/framework_spec/app/spec_runner.rb +12 -0
- data/spec/framework_spec/icon/icon.ico +0 -0
- data/spec/framework_spec/icon/icon.png +0 -0
- data/spec/perfomance_spec/icon/icon.ico +0 -0
- data/spec/perfomance_spec/icon/icon.png +0 -0
- data/spec/phone_spec/app/BlobBulkTest/blob_bulk_test.png +0 -0
- data/spec/phone_spec/app/BlobBulkTest_s/blob_bulk_test_s.png +0 -0
- data/spec/phone_spec/app/PartialTest/_index_partial.erb +5 -0
- data/spec/phone_spec/app/PartialTest/_index_partial_nested.erb +2 -0
- data/spec/phone_spec/app/PartialTest/index.erb +6 -0
- data/spec/phone_spec/app/spec/blob_bulksync_spec.rb +5 -3
- data/spec/phone_spec/app/spec/bulksync_spec.rb +33 -41
- data/spec/phone_spec/app/spec/database_spec.rb +5 -0
- data/spec/phone_spec/app/spec/json_spec.rb +50 -50
- data/spec/phone_spec/app/spec/rho_controller_spec.rb +29 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +184 -47
- data/spec/phone_spec/app/spec_runner.rb +3 -2
- data/spec/phone_spec/icon/icon.ico +0 -0
- data/spec/phone_spec/icon/icon.png +0 -0
- data/spec/phone_spec/rhoconfig.txt +2 -0
- data/version +1 -1
- metadata +339 -47
- data/platform/android/Rhodes/PushReceiver.erb +0 -14
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +0 -126
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +0 -83
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/Config.java +0 -246
- data/platform/bb/rhodes/src/com/rho/rubyext/PNGEncoder.java +0 -613
- data/res/icons/rho.psd +0 -0
- data/res/icons/rhodes.psd +0 -0
- data/res/icons/rhosim.psd +0 -0
@@ -0,0 +1,933 @@
|
|
1
|
+
/*------------------------------------------------------------------------
|
2
|
+
* (The MIT License)
|
3
|
+
*
|
4
|
+
* Copyright (c) 2008-2011 Rhomobile, Inc.
|
5
|
+
*
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
11
|
+
* furnished to do so, subject to the following conditions:
|
12
|
+
*
|
13
|
+
* The above copyright notice and this permission notice shall be included in
|
14
|
+
* all copies or substantial portions of the Software.
|
15
|
+
*
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
22
|
+
* THE SOFTWARE.
|
23
|
+
*
|
24
|
+
* http://rhomobile.com
|
25
|
+
*------------------------------------------------------------------------*/
|
26
|
+
|
27
|
+
#include "logging/RhoLog.h"
|
28
|
+
#undef DEFAULT_LOGCATEGORY
|
29
|
+
#define DEFAULT_LOGCATEGORY "sqlite_crypt"
|
30
|
+
|
31
|
+
extern void rho_db_decrypt( const char* szPartition, int nPartLen, int size, unsigned char* data );
|
32
|
+
extern void rho_db_encrypt( const char* szPartition, int nPartLen, int size, unsigned char* data, unsigned char* dataOut );
|
33
|
+
|
34
|
+
#define FILE_HEADER_SZ 16
|
35
|
+
#define ENCRYPTED_SQLITE_FILE_HEADER "SQLite crypto 3"
|
36
|
+
#define EVP_MAX_KEY_LENGTH 32
|
37
|
+
#define EVP_MAX_IV_LENGTH 16
|
38
|
+
|
39
|
+
typedef struct
|
40
|
+
{
|
41
|
+
char* m_szPartition;
|
42
|
+
int m_nPartLen;
|
43
|
+
unsigned char* m_pPageBuffer;
|
44
|
+
} CRhoSqliteCodecCtx;
|
45
|
+
|
46
|
+
void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode);
|
47
|
+
int sqlite3CodecAttach(sqlite3* db, int nDb, const void *zKey, int nKey);
|
48
|
+
|
49
|
+
void sqlite3FreeCodecArg(void *pCodecArg)
|
50
|
+
{
|
51
|
+
CRhoSqliteCodecCtx *pRhoCtx = (CRhoSqliteCodecCtx *) pCodecArg;
|
52
|
+
if ( pCodecArg == NULL )
|
53
|
+
return;
|
54
|
+
|
55
|
+
if (pRhoCtx->m_szPartition )
|
56
|
+
sqlite3_free(pRhoCtx->m_szPartition);
|
57
|
+
|
58
|
+
pRhoCtx->m_szPartition = NULL;
|
59
|
+
pRhoCtx->m_nPartLen = 0;
|
60
|
+
if ( pRhoCtx->m_pPageBuffer )
|
61
|
+
sqlite3_free(pRhoCtx->m_pPageBuffer);
|
62
|
+
|
63
|
+
pRhoCtx->m_pPageBuffer = NULL;
|
64
|
+
}
|
65
|
+
|
66
|
+
int sqlite3_key(sqlite3 *db, const void *pKey, int nKey)
|
67
|
+
{
|
68
|
+
//RAWLOG_INFO("sqlite3_key");
|
69
|
+
|
70
|
+
if ( db && pKey && nKey )
|
71
|
+
{
|
72
|
+
sqlite3CodecAttach(db, 0, pKey, nKey);
|
73
|
+
return SQLITE_OK;
|
74
|
+
}
|
75
|
+
|
76
|
+
return SQLITE_ERROR;
|
77
|
+
}
|
78
|
+
|
79
|
+
void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode)
|
80
|
+
{
|
81
|
+
CRhoSqliteCodecCtx *pRhoCtx = (CRhoSqliteCodecCtx *) iCtx;
|
82
|
+
int pg_sz = SQLITE_DEFAULT_PAGE_SIZE;
|
83
|
+
int offset = 0;
|
84
|
+
unsigned char *pData = (unsigned char *) data;
|
85
|
+
|
86
|
+
//RAWLOG_INFO("sqlite3Codec");
|
87
|
+
|
88
|
+
if ( pgno == 1 )
|
89
|
+
offset = FILE_HEADER_SZ; /* adjust starting pointers in data page for header offset on first page*/
|
90
|
+
|
91
|
+
switch(mode)
|
92
|
+
{
|
93
|
+
case 0: /* decrypt */
|
94
|
+
case 2:
|
95
|
+
case 3:
|
96
|
+
if ( pgno == 1 )
|
97
|
+
memcpy(pData, SQLITE_FILE_HEADER, FILE_HEADER_SZ); /* copy file header to the first 16 bytes of the page */
|
98
|
+
|
99
|
+
rho_db_decrypt(pRhoCtx->m_szPartition, pRhoCtx->m_nPartLen, pg_sz - offset, pData + offset );
|
100
|
+
return pData;
|
101
|
+
case 6: /* encrypt */
|
102
|
+
case 7:
|
103
|
+
if ( pgno == 1 )
|
104
|
+
memcpy( pRhoCtx->m_pPageBuffer, ENCRYPTED_SQLITE_FILE_HEADER, FILE_HEADER_SZ); /* copy salt to output buffer */
|
105
|
+
|
106
|
+
rho_db_encrypt(pRhoCtx->m_szPartition, pRhoCtx->m_nPartLen, pg_sz - offset, pData + offset, pRhoCtx->m_pPageBuffer + offset);
|
107
|
+
return pRhoCtx->m_pPageBuffer; /* return persistent buffer data, pData remains intact */
|
108
|
+
default:
|
109
|
+
return pData;
|
110
|
+
}
|
111
|
+
|
112
|
+
}
|
113
|
+
|
114
|
+
int sqlite3CodecAttach(sqlite3* db, int nDb, const void *pKey, int nKey)
|
115
|
+
{
|
116
|
+
struct Db *pDb = &db->aDb[nDb];
|
117
|
+
|
118
|
+
//RAWLOG_INFO("sqlite3CodecAttach");
|
119
|
+
|
120
|
+
if ( nKey && pKey && pDb->pBt )
|
121
|
+
{
|
122
|
+
Pager *pPager = sqlite3BtreePager(pDb->pBt);
|
123
|
+
sqlite3_file *fd;
|
124
|
+
|
125
|
+
CRhoSqliteCodecCtx* pRhoCtx = sqlite3Malloc(sizeof(CRhoSqliteCodecCtx));
|
126
|
+
memset(pRhoCtx, 0, sizeof(CRhoSqliteCodecCtx));
|
127
|
+
pRhoCtx->m_szPartition = sqlite3Malloc(nKey);
|
128
|
+
memcpy(pRhoCtx->m_szPartition, pKey, nKey);
|
129
|
+
pRhoCtx->m_nPartLen = nKey;
|
130
|
+
pRhoCtx->m_pPageBuffer = sqlite3Malloc(SQLITE_DEFAULT_PAGE_SIZE);
|
131
|
+
|
132
|
+
sqlite3PagerSetCodec( pPager, sqlite3Codec, NULL, sqlite3FreeCodecArg, (void *)pRhoCtx );
|
133
|
+
fd = (isOpen(pPager->fd)) ? pPager->fd : NULL;
|
134
|
+
|
135
|
+
sqlite3_mutex_enter(db->mutex);
|
136
|
+
|
137
|
+
/* Always overwrite page size and set to the default because the first page of the database
|
138
|
+
in encrypted and thus sqlite can't effectively determine the pagesize. this causes an issue in
|
139
|
+
cases where bytes 16 & 17 of the page header are a power of 2 as reported by John Lehman
|
140
|
+
|
141
|
+
Note: before forcing the page size we need to force pageSizeFixed to 0, else
|
142
|
+
sqliteBtreeSetPageSize will block the change
|
143
|
+
*/
|
144
|
+
pDb->pBt->pBt->pageSizeFixed = 0;
|
145
|
+
sqlite3BtreeSetPageSize( pDb->pBt, SQLITE_DEFAULT_PAGE_SIZE, EVP_MAX_IV_LENGTH, 0 );
|
146
|
+
|
147
|
+
/* if fd is null, then this is an in-memory database and
|
148
|
+
we dont' want to overwrite the AutoVacuum settings
|
149
|
+
if not null, then set to the default */
|
150
|
+
if ( fd != NULL )
|
151
|
+
sqlite3BtreeSetAutoVacuum(pDb->pBt, SQLITE_DEFAULT_AUTOVACUUM);
|
152
|
+
|
153
|
+
sqlite3_mutex_leave(db->mutex);
|
154
|
+
}
|
155
|
+
|
156
|
+
return SQLITE_OK;
|
157
|
+
}
|
158
|
+
|
159
|
+
void sqlite3CodecGetKey(sqlite3* db, int nDb, void **zKey, int *nKey)
|
160
|
+
{
|
161
|
+
struct Db *pDb = &db->aDb[nDb];
|
162
|
+
|
163
|
+
//RAWLOG_INFO("sqlite3CodecGetKey");
|
164
|
+
|
165
|
+
if( pDb->pBt )
|
166
|
+
{
|
167
|
+
Pager *pPager = sqlite3BtreePager(pDb->pBt);
|
168
|
+
CRhoSqliteCodecCtx *pRhoCtx = (CRhoSqliteCodecCtx *) sqlite3PagerGetCodec(pPager);
|
169
|
+
|
170
|
+
if ( pRhoCtx )
|
171
|
+
{ /* if the codec has an attached codec_context user the raw key data */
|
172
|
+
*zKey = pRhoCtx->m_szPartition;
|
173
|
+
*nKey = pRhoCtx->m_nPartLen;
|
174
|
+
} else {
|
175
|
+
*zKey = NULL;
|
176
|
+
*nKey = 0;
|
177
|
+
}
|
178
|
+
}
|
179
|
+
}
|
180
|
+
|
181
|
+
void sqlite3_activate_see(const char* in)
|
182
|
+
{
|
183
|
+
/* do nothing, security enhancements are always active */
|
184
|
+
}
|
185
|
+
|
186
|
+
int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey)
|
187
|
+
{
|
188
|
+
return SQLITE_OK;
|
189
|
+
}
|
190
|
+
|
191
|
+
#if 0
|
192
|
+
/*
|
193
|
+
** SQLCipher
|
194
|
+
** crypto.c developed by Stephen Lombardo (Zetetic LLC)
|
195
|
+
** sjlombardo at zetetic dot net
|
196
|
+
** http://zetetic.net
|
197
|
+
**
|
198
|
+
** Copyright (c) 2009, ZETETIC LLC
|
199
|
+
** All rights reserved.
|
200
|
+
**
|
201
|
+
** Redistribution and use in source and binary forms, with or without
|
202
|
+
** modification, are permitted provided that the following conditions are met:
|
203
|
+
** * Redistributions of source code must retain the above copyright
|
204
|
+
** notice, this list of conditions and the following disclaimer.
|
205
|
+
** * Redistributions in binary form must reproduce the above copyright
|
206
|
+
** notice, this list of conditions and the following disclaimer in the
|
207
|
+
** documentation and/or other materials provided with the distribution.
|
208
|
+
** * Neither the name of the ZETETIC LLC nor the
|
209
|
+
** names of its contributors may be used to endorse or promote products
|
210
|
+
** derived from this software without specific prior written permission.
|
211
|
+
**
|
212
|
+
** THIS SOFTWARE IS PROVIDED BY ZETETIC LLC ''AS IS'' AND ANY
|
213
|
+
** EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
214
|
+
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
215
|
+
** DISCLAIMED. IN NO EVENT SHALL ZETETIC LLC BE LIABLE FOR ANY
|
216
|
+
** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
217
|
+
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
218
|
+
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
219
|
+
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
220
|
+
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
221
|
+
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
222
|
+
**
|
223
|
+
*/
|
224
|
+
/* BEGIN CRYPTO */
|
225
|
+
#ifdef SQLITE_HAS_CODEC
|
226
|
+
|
227
|
+
#include <assert.h>
|
228
|
+
//#include <Wincrypt.h>
|
229
|
+
|
230
|
+
#define EVP_MAX_KEY_LENGTH 32
|
231
|
+
#define EVP_MAX_IV_LENGTH 16
|
232
|
+
|
233
|
+
typedef struct _EVP_CIPHER
|
234
|
+
{
|
235
|
+
int iv_len;
|
236
|
+
int key_len;
|
237
|
+
}EVP_CIPHER;
|
238
|
+
EVP_CIPHER s_cipher = {EVP_MAX_IV_LENGTH, EVP_MAX_KEY_LENGTH};
|
239
|
+
|
240
|
+
const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
|
241
|
+
{
|
242
|
+
return &s_cipher;
|
243
|
+
}
|
244
|
+
|
245
|
+
int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
|
246
|
+
unsigned char *salt, int saltlen, int iter,
|
247
|
+
int keylen, unsigned char *out)
|
248
|
+
{
|
249
|
+
return 0;
|
250
|
+
}
|
251
|
+
|
252
|
+
int RAND_pseudo_bytes(unsigned char *buf, int num)
|
253
|
+
{
|
254
|
+
//TODO: implement RAND_pseudo_bytes
|
255
|
+
return 0;
|
256
|
+
}
|
257
|
+
|
258
|
+
#define EVP_CIPHER_iv_length(e) ((e)->iv_len)
|
259
|
+
#define EVP_CIPHER_key_length(e) ((e)->key_len)
|
260
|
+
|
261
|
+
//#include <openssl/evp.h>
|
262
|
+
//#include <openssl/rand.h>
|
263
|
+
//#include <openssl/hmac.h>
|
264
|
+
//#include "sqliteInt.h"
|
265
|
+
//#include "btreeInt.h"
|
266
|
+
#include "crypto.h"
|
267
|
+
|
268
|
+
void sqlite3pager_get_codec(Pager *pPager, void **ctx);
|
269
|
+
int sqlite3pager_is_mj_pgno(Pager *pPager, Pgno pgno);
|
270
|
+
sqlite3_file *sqlite3Pager_get_fd(Pager *pPager);
|
271
|
+
void sqlite3pager_sqlite3PagerSetCodec(
|
272
|
+
Pager *pPager,
|
273
|
+
void *(*xCodec)(void*,void*,Pgno,int),
|
274
|
+
void (*xCodecSizeChng)(void*,int,int),
|
275
|
+
void (*xCodecFree)(void*),
|
276
|
+
void *pCodec );
|
277
|
+
//RHO
|
278
|
+
#include "logging/RhoLog.h"
|
279
|
+
#undef DEFAULT_LOGCATEGORY
|
280
|
+
#define DEFAULT_LOGCATEGORY "Crypto"
|
281
|
+
//RHO
|
282
|
+
void rho_loginfo(const char* format, ...)
|
283
|
+
{
|
284
|
+
va_list ap;
|
285
|
+
va_start(ap, format);
|
286
|
+
rhoPlainLogArg(__FILE__,__LINE__,L_INFO,DEFAULT_LOGCATEGORY,format,ap);
|
287
|
+
va_end(ap);
|
288
|
+
}
|
289
|
+
|
290
|
+
#define CODEC_DEBUG 1
|
291
|
+
#ifdef CODEC_DEBUG
|
292
|
+
#define CODEC_TRACE(X) {rho_loginfo X;}
|
293
|
+
#else
|
294
|
+
#define CODEC_TRACE(X)
|
295
|
+
#endif
|
296
|
+
|
297
|
+
void sqlite3FreeCodecArg(void *pCodecArg);
|
298
|
+
|
299
|
+
typedef struct {
|
300
|
+
int derive_key;
|
301
|
+
EVP_CIPHER *evp_cipher;
|
302
|
+
int kdf_iter;
|
303
|
+
int key_sz;
|
304
|
+
int iv_sz;
|
305
|
+
int pass_sz;
|
306
|
+
unsigned char *key;
|
307
|
+
char *pass;
|
308
|
+
} cipher_ctx;
|
309
|
+
|
310
|
+
typedef struct {
|
311
|
+
int kdf_salt_sz;
|
312
|
+
int mode_rekey;
|
313
|
+
unsigned char *kdf_salt;
|
314
|
+
unsigned char *buffer;
|
315
|
+
Btree *pBt;
|
316
|
+
cipher_ctx *read_ctx;
|
317
|
+
cipher_ctx *write_ctx;
|
318
|
+
} codec_ctx;
|
319
|
+
|
320
|
+
static void activate_openssl() {
|
321
|
+
sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
|
322
|
+
/* if(EVP_get_cipherbyname(CIPHER) == NULL) {
|
323
|
+
OpenSSL_add_all_algorithms();
|
324
|
+
} */
|
325
|
+
sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
|
326
|
+
}
|
327
|
+
|
328
|
+
/*
|
329
|
+
** Simple routines for converting hex char strings to binary data
|
330
|
+
*/
|
331
|
+
static int cipher_hex2int(char c) {
|
332
|
+
return (c>='0' && c<='9') ? (c)-'0' :
|
333
|
+
(c>='A' && c<='F') ? (c)-'A'+10 :
|
334
|
+
(c>='a' && c<='f') ? (c)-'a'+10 : 0;
|
335
|
+
}
|
336
|
+
|
337
|
+
static void cipher_hex2bin(const char *hex, int sz, unsigned char *out){
|
338
|
+
int i;
|
339
|
+
for(i = 0; i < sz; i += 2){
|
340
|
+
out[i/2] = (cipher_hex2int(hex[i])<<4) | cipher_hex2int(hex[i+1]);
|
341
|
+
}
|
342
|
+
}
|
343
|
+
|
344
|
+
|
345
|
+
/**
|
346
|
+
* Free and wipe memory
|
347
|
+
* If ptr is not null memory will be freed.
|
348
|
+
* If sz is greater than zero, the memory will be overwritten with zero before it is freed
|
349
|
+
*/
|
350
|
+
static void codec_free(void *ptr, int sz) {
|
351
|
+
if(ptr) {
|
352
|
+
if(sz > 0) memset(ptr, 0, sz); // FIXME - require buffer size
|
353
|
+
sqlite3_free(ptr);
|
354
|
+
}
|
355
|
+
}
|
356
|
+
|
357
|
+
/**
|
358
|
+
* Set the raw password / key data for a cipher context
|
359
|
+
*
|
360
|
+
* returns SQLITE_OK if assignment was successfull
|
361
|
+
* returns SQLITE_NOMEM if an error occured allocating memory
|
362
|
+
* returns SQLITE_ERROR if the key couldn't be set because the pass was null or size was zero
|
363
|
+
*/
|
364
|
+
static int cipher_ctx_set_pass(cipher_ctx *ctx, const void *zKey, int nKey) {
|
365
|
+
codec_free(ctx->pass, ctx->pass_sz);
|
366
|
+
ctx->pass_sz = nKey;
|
367
|
+
if(zKey && nKey) {
|
368
|
+
ctx->pass = sqlite3Malloc(nKey);
|
369
|
+
if(ctx->pass == NULL) return SQLITE_NOMEM;
|
370
|
+
memcpy(ctx->pass, zKey, nKey);
|
371
|
+
return SQLITE_OK;
|
372
|
+
}
|
373
|
+
return SQLITE_ERROR;
|
374
|
+
}
|
375
|
+
|
376
|
+
/**
|
377
|
+
* Initialize a a new cipher_ctx struct. This function will allocate memory
|
378
|
+
* for the cipher context and for the key
|
379
|
+
*
|
380
|
+
* returns SQLITE_OK if initialization was successful
|
381
|
+
* returns SQLITE_NOMEM if an error occured allocating memory
|
382
|
+
*/
|
383
|
+
static int cipher_ctx_init(cipher_ctx **iCtx) {
|
384
|
+
cipher_ctx *ctx;
|
385
|
+
*iCtx = sqlite3Malloc(sizeof(cipher_ctx));
|
386
|
+
ctx = *iCtx;
|
387
|
+
if(ctx == NULL) return SQLITE_NOMEM;
|
388
|
+
memset(ctx, 0, sizeof(cipher_ctx));
|
389
|
+
ctx->key = sqlite3Malloc(EVP_MAX_KEY_LENGTH);
|
390
|
+
if(ctx->key == NULL) return SQLITE_NOMEM;
|
391
|
+
return SQLITE_OK;
|
392
|
+
}
|
393
|
+
|
394
|
+
/**
|
395
|
+
* Free and wipe memory associated with a cipher_ctx
|
396
|
+
*/
|
397
|
+
static void cipher_ctx_free(cipher_ctx **iCtx) {
|
398
|
+
cipher_ctx *ctx = *iCtx;
|
399
|
+
CODEC_TRACE(("cipher_ctx_free: entered iCtx=%d\n", iCtx));
|
400
|
+
codec_free(ctx->key, ctx->key_sz);
|
401
|
+
codec_free(ctx->pass, ctx->pass_sz);
|
402
|
+
codec_free(ctx, sizeof(cipher_ctx));
|
403
|
+
}
|
404
|
+
|
405
|
+
/**
|
406
|
+
* Copy one cipher_ctx to another. For instance, assuming that read_ctx is a
|
407
|
+
* fully initialized context, you could copy it to write_ctx and all yet data
|
408
|
+
* and pass information across
|
409
|
+
*
|
410
|
+
* returns SQLITE_OK if initialization was successful
|
411
|
+
* returns SQLITE_NOMEM if an error occured allocating memory
|
412
|
+
*/
|
413
|
+
static int cipher_ctx_copy(cipher_ctx *target, cipher_ctx *source) {
|
414
|
+
void *key = target->key;
|
415
|
+
CODEC_TRACE(("cipher_ctx_copy: entered target=%d, source=%d\n", target, source));
|
416
|
+
codec_free(target->pass, target->pass_sz);
|
417
|
+
memcpy(target, source, sizeof(cipher_ctx));
|
418
|
+
|
419
|
+
target->key = key; //restore pointer to previously allocated key data
|
420
|
+
memcpy(target->key, source->key, EVP_MAX_KEY_LENGTH);
|
421
|
+
target->pass = sqlite3Malloc(source->pass_sz);
|
422
|
+
if(target->pass == NULL) return SQLITE_NOMEM;
|
423
|
+
memcpy(target->pass, source->pass, source->pass_sz);
|
424
|
+
return SQLITE_OK;
|
425
|
+
}
|
426
|
+
|
427
|
+
/**
|
428
|
+
* Compare one cipher_ctx to another.
|
429
|
+
*
|
430
|
+
* returns 0 if all the parameters (except the derived key data) are the same
|
431
|
+
* returns 1 otherwise
|
432
|
+
*/
|
433
|
+
static int cipher_ctx_cmp(cipher_ctx *c1, cipher_ctx *c2) {
|
434
|
+
CODEC_TRACE(("cipher_ctx_cmp: entered c1=%d c2=%d\n", c1, c2));
|
435
|
+
|
436
|
+
if(
|
437
|
+
c1->evp_cipher == c2->evp_cipher
|
438
|
+
&& c1->iv_sz == c2->iv_sz
|
439
|
+
&& c1->kdf_iter == c2->kdf_iter
|
440
|
+
&& c1->key_sz == c2->key_sz
|
441
|
+
&& c1->pass_sz == c2->pass_sz
|
442
|
+
&& (
|
443
|
+
c1->pass == c2->pass
|
444
|
+
|| !memcmp(c1->pass, c2->pass, c1->pass_sz)
|
445
|
+
)
|
446
|
+
) return 0;
|
447
|
+
return 1;
|
448
|
+
}
|
449
|
+
|
450
|
+
/**
|
451
|
+
* Free and wipe memory associated with a cipher_ctx, including the allocated
|
452
|
+
* read_ctx and write_ctx.
|
453
|
+
*/
|
454
|
+
static void codec_ctx_free(codec_ctx **iCtx) {
|
455
|
+
codec_ctx *ctx = *iCtx;
|
456
|
+
CODEC_TRACE(("codec_ctx_free: entered iCtx=%d\n", iCtx));
|
457
|
+
codec_free(ctx->kdf_salt, ctx->kdf_salt_sz);
|
458
|
+
codec_free(ctx->buffer, 0);
|
459
|
+
cipher_ctx_free(&ctx->read_ctx);
|
460
|
+
cipher_ctx_free(&ctx->write_ctx);
|
461
|
+
codec_free(ctx, sizeof(codec_ctx));
|
462
|
+
}
|
463
|
+
|
464
|
+
/**
|
465
|
+
* Derive an encryption key for a cipher contex key based on the raw password.
|
466
|
+
*
|
467
|
+
* If the raw key data is formated as x'hex' and there are exactly enough hex chars to fill
|
468
|
+
* the key space (i.e 64 hex chars for a 256 bit key) then the key data will be used directly.
|
469
|
+
*
|
470
|
+
* Otherwise, a key data will be derived using PBKDF2
|
471
|
+
*
|
472
|
+
* returns SQLITE_OK if initialization was successful
|
473
|
+
* returns SQLITE_NOMEM if the key could't be derived (for instance if pass is NULL or pass_sz is 0)
|
474
|
+
*/
|
475
|
+
static int codec_key_derive(codec_ctx *ctx, cipher_ctx *c_ctx) {
|
476
|
+
CODEC_TRACE(("codec_key_derive: entered c_ctx->pass=%s, c_ctx->pass_sz=%d ctx->kdf_salt=%d ctx->kdf_salt_sz=%d c_ctx->kdf_iter=%d c_ctx->key_sz=%d\n",
|
477
|
+
c_ctx->pass, c_ctx->pass_sz, ctx->kdf_salt, ctx->kdf_salt_sz, c_ctx->kdf_iter, c_ctx->key_sz));
|
478
|
+
|
479
|
+
if(c_ctx->pass && c_ctx->pass_sz) { // if pass is not null
|
480
|
+
if (c_ctx->pass_sz == ((c_ctx->key_sz*2)+3) && sqlite3StrNICmp(c_ctx->pass ,"x'", 2) == 0) {
|
481
|
+
int n = c_ctx->pass_sz - 3; /* adjust for leading x' and tailing ' */
|
482
|
+
const char *z = c_ctx->pass + 2; /* adjust lead offset of x' */
|
483
|
+
CODEC_TRACE(("codec_key_derive: deriving key from hex\n"));
|
484
|
+
cipher_hex2bin(z, n, c_ctx->key);
|
485
|
+
} else {
|
486
|
+
CODEC_TRACE(("codec_key_derive: deriving key using PBKDF2\n"));
|
487
|
+
PKCS5_PBKDF2_HMAC_SHA1(c_ctx->pass, c_ctx->pass_sz, ctx->kdf_salt, ctx->kdf_salt_sz, c_ctx->kdf_iter, c_ctx->key_sz, c_ctx->key);
|
488
|
+
}
|
489
|
+
return SQLITE_OK;
|
490
|
+
};
|
491
|
+
return SQLITE_ERROR;
|
492
|
+
}
|
493
|
+
|
494
|
+
static rho_codec* s_pRhoCodec = 0;
|
495
|
+
void rho_set_codec(rho_codec* pRhoCodec)
|
496
|
+
{
|
497
|
+
s_pRhoCodec = pRhoCodec;
|
498
|
+
}
|
499
|
+
|
500
|
+
/*
|
501
|
+
* ctx - codec context
|
502
|
+
* pgno - page number in database
|
503
|
+
* size - size in bytes of input and output buffers
|
504
|
+
* mode - 1 to encrypt, 0 to decrypt
|
505
|
+
* in - pointer to input bytes
|
506
|
+
* out - pouter to output bytes
|
507
|
+
*/
|
508
|
+
static int codec_cipher(cipher_ctx *ctx, Pgno pgno, int mode, int size, unsigned char *in, unsigned char *out) {
|
509
|
+
// EVP_CIPHER_CTX ectx;
|
510
|
+
//unsigned char *iv;
|
511
|
+
//int tmp_csz, csz;
|
512
|
+
//int i;
|
513
|
+
//DWORD dwErr, dwType;
|
514
|
+
|
515
|
+
CODEC_TRACE(("codec_cipher:entered pgno=%d, mode=%d, size=%d\n", pgno, mode, size));
|
516
|
+
|
517
|
+
if ( s_pRhoCodec )
|
518
|
+
{
|
519
|
+
if ( mode == CIPHER_ENCRYPT )
|
520
|
+
{
|
521
|
+
s_pRhoCodec->pEncrypt(size, in, out);
|
522
|
+
}
|
523
|
+
else
|
524
|
+
{
|
525
|
+
s_pRhoCodec->pDecrypt(size, in, out);
|
526
|
+
}
|
527
|
+
}else
|
528
|
+
memcpy(out, in, size);
|
529
|
+
|
530
|
+
/* just copy raw data from in to out when key size is 0
|
531
|
+
* i.e. during a rekey of a plaintext database */
|
532
|
+
/* if(ctx->key_sz == 0) {
|
533
|
+
memcpy(out, in, size);
|
534
|
+
return SQLITE_OK;
|
535
|
+
}
|
536
|
+
|
537
|
+
// FIXME - only run if using an IV
|
538
|
+
size = size - ctx->iv_sz; // adjust size to useable size and memset reserve at end of page
|
539
|
+
iv = out + size;
|
540
|
+
if(mode == CIPHER_ENCRYPT) {
|
541
|
+
RAND_pseudo_bytes(iv, ctx->iv_sz);
|
542
|
+
} else {
|
543
|
+
memcpy(iv, in+size, ctx->iv_sz);
|
544
|
+
}*/
|
545
|
+
/*
|
546
|
+
EVP_CipherInit(&ectx, ctx->evp_cipher, NULL, NULL, mode);
|
547
|
+
EVP_CIPHER_CTX_set_padding(&ectx, 0);
|
548
|
+
EVP_CipherInit(&ectx, NULL, ctx->key, iv, mode);
|
549
|
+
EVP_CipherUpdate(&ectx, out, &tmp_csz, in, size);
|
550
|
+
csz = tmp_csz;
|
551
|
+
out += tmp_csz;
|
552
|
+
EVP_CipherFinal(&ectx, out, &tmp_csz);
|
553
|
+
csz += tmp_csz;
|
554
|
+
EVP_CIPHER_CTX_cleanup(&ectx);
|
555
|
+
assert(size == csz);*/
|
556
|
+
|
557
|
+
//CryptAcquireContext PROV_RSA_AES
|
558
|
+
/*
|
559
|
+
for (i=0;;i++)
|
560
|
+
{
|
561
|
+
if (!CryptEnumProviderTypes(i, NULL, 0, &dwType, NULL, NULL))
|
562
|
+
{if (ERROR_NO_MORE_ITEMS != (dwErr = GetLastError()))
|
563
|
+
{printf("ERROR - CryptEnumProviderTypes : %X\n", dwErr);
|
564
|
+
}
|
565
|
+
break;
|
566
|
+
}
|
567
|
+
printf ("Provider Type %d\n", dwType);
|
568
|
+
}*/
|
569
|
+
|
570
|
+
return SQLITE_OK;
|
571
|
+
}
|
572
|
+
|
573
|
+
int codec_set_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
|
574
|
+
struct Db *pDb = &db->aDb[nDb];
|
575
|
+
CODEC_TRACE(("codec_set_kdf_iter: entered db=%d nDb=%d kdf_iter=%d for_ctx=%d\n", db, nDb, kdf_iter, for_ctx));
|
576
|
+
|
577
|
+
if(pDb->pBt) {
|
578
|
+
codec_ctx *ctx;
|
579
|
+
cipher_ctx *c_ctx;
|
580
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
581
|
+
c_ctx = for_ctx ? ctx->write_ctx : ctx->read_ctx;
|
582
|
+
|
583
|
+
c_ctx->kdf_iter = kdf_iter;
|
584
|
+
c_ctx->derive_key = 1;
|
585
|
+
|
586
|
+
if(for_ctx == 2) cipher_ctx_copy( for_ctx ? ctx->read_ctx : ctx->write_ctx, c_ctx);
|
587
|
+
return SQLITE_OK;
|
588
|
+
}
|
589
|
+
return SQLITE_ERROR;
|
590
|
+
}
|
591
|
+
|
592
|
+
/**
|
593
|
+
*
|
594
|
+
* when for_ctx == 0 then it will change for read
|
595
|
+
* when for_ctx == 1 then it will change for write
|
596
|
+
* when for_ctx == 2 then it will change for both
|
597
|
+
*/
|
598
|
+
int codec_set_cipher_name(sqlite3* db, int nDb, const char *cipher_name, int for_ctx) {
|
599
|
+
struct Db *pDb = &db->aDb[nDb];
|
600
|
+
CODEC_TRACE(("codec_set_cipher_name: entered db=%d nDb=%d cipher_name=%s for_ctx=%d\n", db, nDb, cipher_name, for_ctx));
|
601
|
+
|
602
|
+
if(pDb->pBt) {
|
603
|
+
codec_ctx *ctx;
|
604
|
+
cipher_ctx *c_ctx;
|
605
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
606
|
+
c_ctx = for_ctx ? ctx->write_ctx : ctx->read_ctx;
|
607
|
+
|
608
|
+
c_ctx->evp_cipher = (EVP_CIPHER *) EVP_get_cipherbyname(cipher_name);
|
609
|
+
c_ctx->key_sz = EVP_CIPHER_key_length(c_ctx->evp_cipher);
|
610
|
+
c_ctx->iv_sz = EVP_CIPHER_iv_length(c_ctx->evp_cipher);
|
611
|
+
c_ctx->derive_key = 1;
|
612
|
+
|
613
|
+
if(for_ctx == 2) cipher_ctx_copy( for_ctx ? ctx->read_ctx : ctx->write_ctx, c_ctx);
|
614
|
+
return SQLITE_OK;
|
615
|
+
}
|
616
|
+
return SQLITE_ERROR;
|
617
|
+
}
|
618
|
+
|
619
|
+
int codec_set_pass_key(sqlite3* db, int nDb, const void *zKey, int nKey, int for_ctx) {
|
620
|
+
struct Db *pDb = &db->aDb[nDb];
|
621
|
+
CODEC_TRACE(("codec_set_pass_key: entered db=%d nDb=%d cipher_name=%s nKey=%d for_ctx=%d\n", db, nDb, zKey, nKey, for_ctx));
|
622
|
+
if(pDb->pBt) {
|
623
|
+
codec_ctx *ctx;
|
624
|
+
cipher_ctx *c_ctx;
|
625
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
626
|
+
c_ctx = for_ctx ? ctx->write_ctx : ctx->read_ctx;
|
627
|
+
|
628
|
+
cipher_ctx_set_pass(c_ctx, zKey, nKey);
|
629
|
+
c_ctx->derive_key = 1;
|
630
|
+
|
631
|
+
if(for_ctx == 2) cipher_ctx_copy( for_ctx ? ctx->read_ctx : ctx->write_ctx, c_ctx);
|
632
|
+
return SQLITE_OK;
|
633
|
+
}
|
634
|
+
return SQLITE_ERROR;
|
635
|
+
}
|
636
|
+
|
637
|
+
/*
|
638
|
+
* sqlite3Codec can be called in multiple modes.
|
639
|
+
* encrypt mode - expected to return a pointer to the
|
640
|
+
* encrypted data without altering pData.
|
641
|
+
* decrypt mode - expected to return a pointer to pData, with
|
642
|
+
* the data decrypted in the input buffer
|
643
|
+
*/
|
644
|
+
void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode) {
|
645
|
+
codec_ctx *ctx = (codec_ctx *) iCtx;
|
646
|
+
int pg_sz = SQLITE_DEFAULT_PAGE_SIZE;
|
647
|
+
int offset = 0;
|
648
|
+
unsigned char *pData = (unsigned char *) data;
|
649
|
+
|
650
|
+
CODEC_TRACE(("sqlite3Codec: entered pgno=%d, mode=%d, ctx->mode_rekey=%d, pg_sz=%d\n", pgno, mode, ctx->mode_rekey, pg_sz));
|
651
|
+
|
652
|
+
/* derive key on first use if necessary */
|
653
|
+
if(ctx->read_ctx->derive_key) {
|
654
|
+
codec_key_derive(ctx, ctx->read_ctx);
|
655
|
+
ctx->read_ctx->derive_key = 0;
|
656
|
+
}
|
657
|
+
|
658
|
+
if(ctx->write_ctx->derive_key) {
|
659
|
+
if(cipher_ctx_cmp(ctx->write_ctx, ctx->read_ctx) == 0) {
|
660
|
+
cipher_ctx_copy(ctx->write_ctx, ctx->read_ctx); // the relevant parameters are the same, just copy read key
|
661
|
+
} else {
|
662
|
+
codec_key_derive(ctx, ctx->write_ctx);
|
663
|
+
ctx->write_ctx->derive_key = 0;
|
664
|
+
}
|
665
|
+
}
|
666
|
+
|
667
|
+
|
668
|
+
if(pgno == 1) offset = FILE_HEADER_SZ; /* adjust starting pointers in data page for header offset on first page*/
|
669
|
+
|
670
|
+
CODEC_TRACE(("sqlite3Codec: switch mode=%d offset=%d\n", mode, offset));
|
671
|
+
switch(mode) {
|
672
|
+
case 0: /* decrypt */
|
673
|
+
case 2:
|
674
|
+
case 3:
|
675
|
+
if(pgno == 1) memcpy(ctx->buffer, SQLITE_FILE_HEADER, FILE_HEADER_SZ); /* copy file header to the first 16 bytes of the page */
|
676
|
+
codec_cipher(ctx->read_ctx, pgno, CIPHER_DECRYPT, pg_sz - offset, pData + offset, ctx->buffer + offset);
|
677
|
+
memcpy(pData, ctx->buffer, pg_sz); /* copy buffer data back to pData and return */
|
678
|
+
return pData;
|
679
|
+
break;
|
680
|
+
case 6: /* encrypt */
|
681
|
+
if(pgno == 1) memcpy(ctx->buffer, ctx->kdf_salt, FILE_HEADER_SZ); /* copy salt to output buffer */
|
682
|
+
codec_cipher(ctx->write_ctx, pgno, CIPHER_ENCRYPT, pg_sz - offset, pData + offset, ctx->buffer + offset);
|
683
|
+
return ctx->buffer; /* return persistent buffer data, pData remains intact */
|
684
|
+
break;
|
685
|
+
case 7:
|
686
|
+
if(pgno == 1) memcpy(ctx->buffer, ctx->kdf_salt, FILE_HEADER_SZ); /* copy salt to output buffer */
|
687
|
+
codec_cipher(ctx->read_ctx, pgno, CIPHER_ENCRYPT, pg_sz - offset, pData + offset, ctx->buffer + offset);
|
688
|
+
return ctx->buffer; /* return persistent buffer data, pData remains intact */
|
689
|
+
break;
|
690
|
+
default:
|
691
|
+
return pData;
|
692
|
+
break;
|
693
|
+
}
|
694
|
+
}
|
695
|
+
|
696
|
+
|
697
|
+
int sqlite3CodecAttach(sqlite3* db, int nDb, const void *zKey, int nKey) {
|
698
|
+
struct Db *pDb = &db->aDb[nDb];
|
699
|
+
|
700
|
+
CODEC_TRACE(("sqlite3CodecAttach: entered nDb=%d zKey=%s, nKey=%d\n", nDb, zKey, nKey));
|
701
|
+
activate_openssl();
|
702
|
+
|
703
|
+
if(nKey && zKey && pDb->pBt) {
|
704
|
+
codec_ctx *ctx;
|
705
|
+
int rc;
|
706
|
+
Pager *pPager = pDb->pBt->pBt->pPager;
|
707
|
+
sqlite3_file *fd;
|
708
|
+
|
709
|
+
ctx = sqlite3Malloc(sizeof(codec_ctx));
|
710
|
+
if(ctx == NULL) return SQLITE_NOMEM;
|
711
|
+
memset(ctx, 0, sizeof(codec_ctx)); /* initialize all pointers and values to 0 */
|
712
|
+
|
713
|
+
ctx->pBt = pDb->pBt; /* assign pointer to database btree structure */
|
714
|
+
|
715
|
+
if((rc = cipher_ctx_init(&ctx->read_ctx)) != SQLITE_OK) return rc;
|
716
|
+
if((rc = cipher_ctx_init(&ctx->write_ctx)) != SQLITE_OK) return rc;
|
717
|
+
|
718
|
+
/* pre-allocate a page buffer of PageSize bytes. This will
|
719
|
+
be used as a persistent buffer for encryption and decryption
|
720
|
+
operations to avoid overhead of multiple memory allocations*/
|
721
|
+
ctx->buffer = sqlite3Malloc(SQLITE_DEFAULT_PAGE_SIZE);
|
722
|
+
if(ctx->buffer == NULL) return SQLITE_NOMEM;
|
723
|
+
|
724
|
+
/* allocate space for salt data. Then read the first 16 bytes
|
725
|
+
directly off the database file. This is the salt for the
|
726
|
+
key derivation function. If we get a short read allocate
|
727
|
+
a new random salt value */
|
728
|
+
ctx->kdf_salt_sz = FILE_HEADER_SZ;
|
729
|
+
ctx->kdf_salt = sqlite3Malloc(ctx->kdf_salt_sz);
|
730
|
+
if(ctx->kdf_salt == NULL) return SQLITE_NOMEM;
|
731
|
+
|
732
|
+
|
733
|
+
fd = sqlite3Pager_get_fd(pPager);
|
734
|
+
if(fd == NULL || sqlite3OsRead(fd, ctx->kdf_salt, FILE_HEADER_SZ, 0) != SQLITE_OK) {
|
735
|
+
/* if unable to read the bytes, generate random salt */
|
736
|
+
RAND_pseudo_bytes(ctx->kdf_salt, FILE_HEADER_SZ);
|
737
|
+
}
|
738
|
+
|
739
|
+
sqlite3pager_sqlite3PagerSetCodec(sqlite3BtreePager(pDb->pBt), sqlite3Codec, NULL, sqlite3FreeCodecArg, (void *) ctx);
|
740
|
+
|
741
|
+
codec_set_cipher_name(db, nDb, CIPHER, 0);
|
742
|
+
codec_set_kdf_iter(db, nDb, PBKDF2_ITER, 0);
|
743
|
+
codec_set_pass_key(db, nDb, zKey, nKey, 0);
|
744
|
+
cipher_ctx_copy(ctx->write_ctx, ctx->read_ctx);
|
745
|
+
|
746
|
+
sqlite3_mutex_enter(db->mutex);
|
747
|
+
|
748
|
+
/* Always overwrite page size and set to the default because the first page of the database
|
749
|
+
in encrypted and thus sqlite can't effectively determine the pagesize. this causes an issue in
|
750
|
+
cases where bytes 16 & 17 of the page header are a power of 2 as reported by John Lehman
|
751
|
+
|
752
|
+
Note: before forcing the page size we need to force pageSizeFixed to 0, else
|
753
|
+
sqliteBtreeSetPageSize will block the change
|
754
|
+
*/
|
755
|
+
pDb->pBt->pBt->pageSizeFixed = 0;
|
756
|
+
sqlite3BtreeSetPageSize(ctx->pBt, SQLITE_DEFAULT_PAGE_SIZE, EVP_MAX_IV_LENGTH, 0);
|
757
|
+
|
758
|
+
/* if fd is null, then this is an in-memory database and
|
759
|
+
we dont' want to overwrite the AutoVacuum settings
|
760
|
+
if not null, then set to the default */
|
761
|
+
if(fd != NULL) {
|
762
|
+
sqlite3BtreeSetAutoVacuum(ctx->pBt, SQLITE_DEFAULT_AUTOVACUUM);
|
763
|
+
}
|
764
|
+
|
765
|
+
sqlite3_mutex_leave(db->mutex);
|
766
|
+
}
|
767
|
+
return SQLITE_OK;
|
768
|
+
}
|
769
|
+
|
770
|
+
void sqlite3FreeCodecArg(void *pCodecArg) {
|
771
|
+
codec_ctx *ctx = (codec_ctx *) pCodecArg;
|
772
|
+
if(pCodecArg == NULL) return;
|
773
|
+
codec_ctx_free(&ctx); // wipe and free allocated memory for the context
|
774
|
+
}
|
775
|
+
|
776
|
+
void sqlite3_activate_see(const char* in) {
|
777
|
+
/* do nothing, security enhancements are always active */
|
778
|
+
}
|
779
|
+
|
780
|
+
int sqlite3_key(sqlite3 *db, const void *pKey, int nKey) {
|
781
|
+
CODEC_TRACE(("sqlite3_key: entered db=%d pKey=%s nKey=%d\n", db, pKey, nKey));
|
782
|
+
/* attach key if db and pKey are not null and nKey is > 0 */
|
783
|
+
if(db && pKey && nKey) {
|
784
|
+
sqlite3CodecAttach(db, 0, pKey, nKey); // operate only on the main db
|
785
|
+
return SQLITE_OK;
|
786
|
+
}
|
787
|
+
return SQLITE_ERROR;
|
788
|
+
}
|
789
|
+
|
790
|
+
/* sqlite3_rekey
|
791
|
+
** Given a database, this will reencrypt the database using a new key.
|
792
|
+
** There are two possible modes of operation. The first is rekeying
|
793
|
+
** an existing database that was not previously encrypted. The second
|
794
|
+
** is to change the key on an existing database.
|
795
|
+
**
|
796
|
+
** The proposed logic for this function follows:
|
797
|
+
** 1. Determine if there is already a key present
|
798
|
+
** 2. If there is NOT already a key present, create one and attach a codec (key would be null)
|
799
|
+
** 3. Initialize a ctx->rekey parameter of the codec
|
800
|
+
**
|
801
|
+
** Note: this will require modifications to the sqlite3Codec to support rekey
|
802
|
+
**
|
803
|
+
*/
|
804
|
+
int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
|
805
|
+
CODEC_TRACE(("sqlite3_rekey: entered db=%d pKey=%s, nKey=%d\n", db, pKey, nKey));
|
806
|
+
activate_openssl();
|
807
|
+
if(db && pKey && nKey) {
|
808
|
+
struct Db *pDb = &db->aDb[0];
|
809
|
+
CODEC_TRACE(("sqlite3_rekey: database pDb=%d\n", pDb));
|
810
|
+
if(pDb->pBt) {
|
811
|
+
codec_ctx *ctx;
|
812
|
+
int rc, page_count;
|
813
|
+
Pgno pgno;
|
814
|
+
PgHdr *page;
|
815
|
+
Pager *pPager = pDb->pBt->pBt->pPager;
|
816
|
+
|
817
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
818
|
+
|
819
|
+
if(ctx == NULL) {
|
820
|
+
CODEC_TRACE(("sqlite3_rekey: no codec attached to db, attaching now\n"));
|
821
|
+
/* there was no codec attached to this database,so attach one now with a null password */
|
822
|
+
sqlite3CodecAttach(db, 0, pKey, nKey);
|
823
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
824
|
+
|
825
|
+
/* prepare this setup as if it had already been initialized */
|
826
|
+
RAND_pseudo_bytes(ctx->kdf_salt, ctx->kdf_salt_sz);
|
827
|
+
ctx->read_ctx->key_sz = ctx->read_ctx->iv_sz = ctx->read_ctx->pass_sz = 0;
|
828
|
+
}
|
829
|
+
|
830
|
+
sqlite3_mutex_enter(db->mutex);
|
831
|
+
|
832
|
+
if(ctx->read_ctx->iv_sz != ctx->write_ctx->iv_sz) {
|
833
|
+
char *error;
|
834
|
+
CODEC_TRACE(("sqlite3_rekey: updating page size for iv_sz change from %d to %d\n", ctx->read_ctx->iv_sz, ctx->write_ctx->iv_sz));
|
835
|
+
db->nextPagesize = SQLITE_DEFAULT_PAGE_SIZE;
|
836
|
+
pDb->pBt->pBt->pageSizeFixed = 0; /* required for sqlite3BtreeSetPageSize to modify pagesize setting */
|
837
|
+
sqlite3BtreeSetPageSize(pDb->pBt, db->nextPagesize, EVP_MAX_IV_LENGTH, 0);
|
838
|
+
sqlite3RunVacuum(&error, db);
|
839
|
+
}
|
840
|
+
|
841
|
+
codec_set_pass_key(db, 0, pKey, nKey, 1);
|
842
|
+
ctx->mode_rekey = 1;
|
843
|
+
|
844
|
+
/* do stuff here to rewrite the database
|
845
|
+
** 1. Create a transaction on the database
|
846
|
+
** 2. Iterate through each page, reading it and then writing it.
|
847
|
+
** 3. If that goes ok then commit and put ctx->rekey into ctx->key
|
848
|
+
** note: don't deallocate rekey since it may be used in a subsequent iteration
|
849
|
+
*/
|
850
|
+
rc = sqlite3BtreeBeginTrans(pDb->pBt, 1); /* begin write transaction */
|
851
|
+
sqlite3PagerPagecount(pPager, &page_count);
|
852
|
+
for(pgno = 1; rc == SQLITE_OK && pgno <= page_count; pgno++) { /* pgno's start at 1 see pager.c:pagerAcquire */
|
853
|
+
if(!sqlite3pager_is_mj_pgno(pPager, pgno)) { /* skip this page (see pager.c:pagerAcquire for reasoning) */
|
854
|
+
rc = sqlite3PagerGet(pPager, pgno, &page);
|
855
|
+
if(rc == SQLITE_OK) { /* write page see pager_incr_changecounter for example */
|
856
|
+
rc = sqlite3PagerWrite(page);
|
857
|
+
//printf("sqlite3PagerWrite(%d)\n", pgno);
|
858
|
+
if(rc == SQLITE_OK) {
|
859
|
+
sqlite3PagerUnref(page);
|
860
|
+
}
|
861
|
+
}
|
862
|
+
}
|
863
|
+
}
|
864
|
+
|
865
|
+
/* if commit was successful commit and copy the rekey data to current key, else rollback to release locks */
|
866
|
+
if(rc == SQLITE_OK) {
|
867
|
+
CODEC_TRACE(("sqlite3_rekey: committing\n"));
|
868
|
+
db->nextPagesize = SQLITE_DEFAULT_PAGE_SIZE;
|
869
|
+
rc = sqlite3BtreeCommit(pDb->pBt);
|
870
|
+
cipher_ctx_copy(ctx->read_ctx, ctx->write_ctx);
|
871
|
+
} else {
|
872
|
+
CODEC_TRACE(("sqlite3_rekey: rollback\n"));
|
873
|
+
sqlite3BtreeRollback(pDb->pBt);
|
874
|
+
}
|
875
|
+
|
876
|
+
ctx->mode_rekey = 0;
|
877
|
+
sqlite3_mutex_leave(db->mutex);
|
878
|
+
}
|
879
|
+
return SQLITE_OK;
|
880
|
+
}
|
881
|
+
return SQLITE_ERROR;
|
882
|
+
}
|
883
|
+
|
884
|
+
void sqlite3CodecGetKey(sqlite3* db, int nDb, void **zKey, int *nKey) {
|
885
|
+
struct Db *pDb = &db->aDb[nDb];
|
886
|
+
CODEC_TRACE(("sqlite3CodecGetKey: entered db=%d, nDb=%d\n", db, nDb));
|
887
|
+
|
888
|
+
if( pDb->pBt ) {
|
889
|
+
codec_ctx *ctx;
|
890
|
+
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
|
891
|
+
|
892
|
+
if(ctx) { /* if the codec has an attached codec_context user the raw key data */
|
893
|
+
*zKey = ctx->read_ctx->pass;
|
894
|
+
*nKey = ctx->read_ctx->pass_sz;
|
895
|
+
} else {
|
896
|
+
*zKey = NULL;
|
897
|
+
*nKey = 0;
|
898
|
+
}
|
899
|
+
}
|
900
|
+
}
|
901
|
+
|
902
|
+
|
903
|
+
/* BEGIN CRYPTO */
|
904
|
+
#ifdef SQLITE_HAS_CODEC
|
905
|
+
void sqlite3pager_get_codec(Pager *pPager, void **ctx) {
|
906
|
+
*ctx = pPager->pCodec;
|
907
|
+
}
|
908
|
+
|
909
|
+
int sqlite3pager_is_mj_pgno(Pager *pPager, Pgno pgno) {
|
910
|
+
return (PAGER_MJ_PGNO(pPager) == pgno) ? 1 : 0;
|
911
|
+
}
|
912
|
+
|
913
|
+
sqlite3_file *sqlite3Pager_get_fd(Pager *pPager) {
|
914
|
+
return (isOpen(pPager->fd)) ? pPager->fd : NULL;
|
915
|
+
}
|
916
|
+
|
917
|
+
void sqlite3pager_sqlite3PagerSetCodec(
|
918
|
+
Pager *pPager,
|
919
|
+
void *(*xCodec)(void*,void*,Pgno,int),
|
920
|
+
void (*xCodecSizeChng)(void*,int,int),
|
921
|
+
void (*xCodecFree)(void*),
|
922
|
+
void *pCodec
|
923
|
+
){
|
924
|
+
sqlite3PagerSetCodec(pPager, xCodec, xCodecSizeChng, xCodecFree, pCodec);
|
925
|
+
}
|
926
|
+
|
927
|
+
|
928
|
+
#endif
|
929
|
+
/* END CRYPTO */
|
930
|
+
|
931
|
+
/* END CRYPTO */
|
932
|
+
#endif
|
933
|
+
#endif //0
|