From: drh <drh@noemail.net>
Date: Thu, 12 Feb 2004 20:49:36 +0000 (+0000)
Subject: Add a new parameter to the (unimplemented) encryption API. (CVS 1234)
X-Git-Tag: version-3.6.10~4834
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e384a4ed4e50a3d777863e0f9377010b12b3e8e8;p=thirdparty%2Fsqlite.git

Add a new parameter to the (unimplemented) encryption API. (CVS 1234)

FossilOrigin-Name: 5fe8f02306cf1c0af2148835cee0df3003ad0874
---

diff --git a/manifest b/manifest
index 086dad5c9b..4481d093eb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_NOTADB\sreturn\scode\sfor\scases\swhen\syou\stry\sto\sopen\sa\sfile\nthat\sdoes\snot\seven\sremotely\sresemble\san\sSQLite\sdatabase\sfile.\s(CVS\s1233)
-D 2004-02-12T19:01:05
+C Add\sa\snew\sparameter\sto\sthe\s(unimplemented)\sencryption\sAPI.\s(CVS\s1234)
+D 2004-02-12T20:49:36
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -47,11 +47,11 @@ F src/pragma.c 89d62c31c6f0a43376fe8d20549b87a6d30c467a
 F src/printf.c 84e4ea4ba49cbbf930e95e82295127ad5843ae1f
 F src/random.c 775913e0b7fbd6295d21f12a7bd35b46387c44b2
 F src/select.c a3a203f9b68c899ac69dbc5fa11cd649fd8acd06
-F src/shell.c c1c7242ede2af46044378d36d2c533e98fd59fb8
-F src/sqlite.h.in 77b0c68726b7d3bb6335e301debb2de148dc1169
+F src/shell.c f6975f87264d04398c9ffa51117c6e3a7f4f4396
+F src/sqlite.h.in 64f016cd5ce190643a0f47760188fdf4e0b2227e
 F src/sqliteInt.h c45fbae6278407111d7a00aa9280ddc0f51344ad
 F src/table.c d845cb101b5afc1f7fea083c99e3d2fa7998d895
-F src/tclsqlite.c c4174ecb406810435b6670f6e470e39424c52804
+F src/tclsqlite.c b84dafe3a8532ff534c36e96bd38880e4b9cedf3
 F src/test1.c 56e9a156df3ad5e4e98df776776e963effc727f7
 F src/test2.c 75819b0f2c63c6a0fd6995445881f2eb94036996
 F src/test3.c 30985ebdfaf3ee1462a9b0652d3efbdc8d9798f5
@@ -184,7 +184,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 800c11f4bce014a07110eb539992a609e6418406
-R e34b1ca8621284ba0ec92cd624f757fa
+P 0c77cee70f078152969933c1d340cea1c86286b0
+R 4be60c410d6a1f5809447c3d05e4f8c5
 U drh
-Z be3fd85f44027e94830f95d929d96578
+Z f3af3c80152ef34879d7dc074d7d117b
diff --git a/manifest.uuid b/manifest.uuid
index ff926d4f5a..ed60521af3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c77cee70f078152969933c1d340cea1c86286b0
\ No newline at end of file
+5fe8f02306cf1c0af2148835cee0df3003ad0874
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 55438e8d6d..2a466f88de 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.87 2004/02/11 10:37:23 drh Exp $
+** $Id: shell.c,v 1.88 2004/02/12 20:49:36 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -513,7 +513,7 @@ static void open_db(struct callback_data *p){
     char *zErrMsg = 0;
 #ifdef SQLITE_HAS_CODEC
     int n = p->zKey ? strlen(p->zKey) : 0;
-    p->db = sqlite_open_encrypted(p->zDbFilename, p->zKey, n, &zErrMsg);
+    p->db = sqlite_open_encrypted(p->zDbFilename, p->zKey, n, 0, &zErrMsg);
 #else
     p->db = sqlite_open(p->zDbFilename, 0, &zErrMsg);
 #endif
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6fbc2b3faf..32946ce6cd 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.56 2004/02/12 19:01:05 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.57 2004/02/12 20:49:36 drh Exp $
 */
 #ifndef _SQLITE_H_
 #define _SQLITE_H_
@@ -785,6 +785,7 @@ sqlite *sqlite_open_encrypted(
   const char *zFilename,   /* Name of the encrypted database */
   const void *pKey,        /* Pointer to the key */
   int nKey,                /* Number of bytes in the key */
+  int *pErrcode,           /* Write error code here */
   char **pzErrmsg          /* Write error message here */
 );
 
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 1857d50ab6..2ef5bfa9ed 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.57 2004/02/11 10:37:23 drh Exp $
+** $Id: tclsqlite.c,v 1.58 2004/02/12 20:49:36 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1064,7 +1064,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
   memset(p, 0, sizeof(*p));
   zFile = Tcl_GetStringFromObj(objv[2], 0);
 #ifdef SQLITE_HAS_CODEC
-  p->db = sqlite_open_encrypted(zFile, pKey, nKey, &zErrMsg);
+  p->db = sqlite_open_encrypted(zFile, pKey, nKey, 0, &zErrMsg);
 #else
   p->db = sqlite_open(zFile, mode, &zErrMsg);
 #endif