Fossil

Check-in [60026ba3cb]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Never prompt for the encryption password, regardless of the repository name, unless the USE_SEE compile-time option was specified.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 60026ba3cbb99e4f15ad0335fdfa4f78b3df4da0
User & Date: drh 2016-04-22 20:06:29.568
Context
2016-04-25
04:13
Make the glob pattern for encrypted repositories a bit more strict. check-in: 980fdda64b user: mistachkin tags: trunk
2016-04-22
20:06
Never prompt for the encryption password, regardless of the repository name, unless the USE_SEE compile-time option was specified. check-in: 60026ba3cb user: drh tags: trunk
20:02
Minor makefile consistency fix. check-in: 6c4a0a0ae5 user: mistachkin tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/db.c.
879
880
881
882
883
884
885

886
887
888
889
890
891
892
893
894
895
896

897
898
899
900
901
902
903
** just return a copy of the previous result.
*/
static void db_encryption_key(
  const char *zDbFile,   /* Name of the database file */
  Blob *pKey             /* Put the encryption key here */
){
  blob_init(pKey, 0, 0);

  if( sqlite3_strglob("*efossil", zDbFile)==0 ){
    static char *zSavedKey = 0;
    if( zSavedKey ){
      blob_set(pKey, zSavedKey);
    }else{
      char *zPrompt = mprintf("\rencryption key for '%s': ", zDbFile);
      prompt_for_password(zPrompt, pKey, 0);
      fossil_free(zPrompt);
      zSavedKey = fossil_strdup(blob_str(pKey));
    }
  }

}


/*
** Open a database file.  Return a pointer to the new database
** connection.  An error results in process abort.
*/







>











>







879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
** just return a copy of the previous result.
*/
static void db_encryption_key(
  const char *zDbFile,   /* Name of the database file */
  Blob *pKey             /* Put the encryption key here */
){
  blob_init(pKey, 0, 0);
#if USE_SEE
  if( sqlite3_strglob("*efossil", zDbFile)==0 ){
    static char *zSavedKey = 0;
    if( zSavedKey ){
      blob_set(pKey, zSavedKey);
    }else{
      char *zPrompt = mprintf("\rencryption key for '%s': ", zDbFile);
      prompt_for_password(zPrompt, pKey, 0);
      fossil_free(zPrompt);
      zSavedKey = fossil_strdup(blob_str(pKey));
    }
  }
#endif
}


/*
** Open a database file.  Return a pointer to the new database
** connection.  An error results in process abort.
*/