Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sqlcipher/android-database-sqlcipher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: eighthave/android-database-sqlcipher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 14, 2014

  1. do not put timestamps in javadoc-generated files 

    This aids reproducible builds: besides the timestamp, `javadoc` will create
the exact same files across different machines, java versions, etc.
    @eighthave
    eighthave committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    36e7e5b View commit details
    Browse the repository at this point in the history

  2. find path to set ndk.dir, if ndk.dir is not set already 

    One standard way of setting ndk.dir is to set it in a .properties file. If
that has not been done, then this ant code looks for the env var
ANDROID_NDK and the path where ndk-build is installed.

ndk.dir is not currently used by the build system, except to write out info
to the manifest about the build environment.
    @eighthave
    eighthave committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    96a3f55 View commit details
    Browse the repository at this point in the history

  3. methods for handing raw key directly to sqlite3_key() and sqlite_rekey() 

    This provides methods for handing the raw AES key data directly to
SQLCipher, skipping SQLCipher's key derivation process. This allows an app
to make their own key derivation process.  This is how we already handle
things with CacheWord, which uses 32 random bytes for the raw key, then
manages sending that raw key to multiple things that need to be unlocked
(SQLCipher-for-Android, IOCipher, RSA keys, etc).
    @eighthave
    eighthave committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    f8654f9 View commit details
    Browse the repository at this point in the history
Loading