sqlcipher-packaging

sqlcipher-packaging:ditto-4000kdf

  1. Git
  2. lp:sqlcipher-packaging
  3. ditto-4000kdf
Last commit made on 2012-04-11
Get this branch:
git clone -b ditto-4000kdf https://git.launchpad.net/sqlcipher-packaging

Branch merges

Branch information

Name:
ditto-4000kdf
Repository:
lp:sqlcipher-packaging

Recent commits

5ef4710... by Billy Gray

branch of ditto without 10000 as the kdf setting (e.g. strip-mac:master)

1a93554... by Billy Gray

Use flag to default number of iterations to 10000

1fdb22f... by Stephen Lombardo <email address hidden>

Merge branch 'master' into ditto

885ffa9... by Stephen Lombardo <email address hidden>

update xcode project file to set -mno-thumb for armv6 only

aa848eb... by Stephen Lombardo <email address hidden>

Merge branch 'release-merge'

8f061f1... by Stephen Lombardo <email address hidden>

add pragma cipher_default_use_hmac to toggle global HMAC setting

0dc7a37... by Billy Gray

minor merge conflict resolved
Merge branch 'master' into ditto

Conflicts:
 src/func.c

ff9a340... by Stephen Lombardo <email address hidden>

add -mno-thumb cflag to avoid armv6 crash

758cc13... by Stephen Lombardo <email address hidden>

use new btsFlags under 3.7.10 instead of pageSizeFixed

eb9b657... by Stephen Lombardo <email address hidden>

Merge branch 'sqlite-release' into release-merge