merge

CHANGELOG.md

@@ -1,7 +1,40 @@
-Release v1.20170127
+Release v1.20180618
 
-* Starting CHANGELOG.
+* Restore `make manual-install` with warning. (#258)
 
+Release v1.20180615
+
+* Standardize on .blackbox for config. Use keyrings/live for backwards compatibility.
+* Store keys in .blackbox directory (#218)
+* Suggest committing changes to pubring.gpg when running blackbox_removeadmin (#248)
+* Fix typo (#246)
+* Improve installation instructions (#244)
+* Fix replacing-expired-keys link in README (#241)
+* Fix problems when gpg2 is installed next to gpg (#237)
+* Many documentation corrections, updates, etc.
+* Exclude default keyring from import (#223)
+* .gitattributes not always updated (PR#146)
+* Fix bugs related to updating .gitattributes (PR#146)
+* Update readme with CircleCI link (#216)
+* Run the tests on a CI (#215)
+* Fixed Alpine compatibility (chmod) (#212)
+* direct repobase message to stderr (#204)
+* Improve Windows compatibility
+* NEW: .gitattributes Set Unix-only files to eol=lf
+* Silence 'not changed' output during keychain import (#200)
+* Improve FreeBSD compatibility
+* shred_file() outputs warning message to stderr. (#192)
+* Don't complain about GPG_AGENT_INFO if using newer gpg-agent (#189)
+* [FreeBSD] Fix use of chmod (#180)
+* Requiring a file to be entered to finish editing (#175)
+* Remove the key from the keyring when removing an admin (#173)
+* Add FreeBSD support (#172)
+* Add list admins commandline tool. (#170)
+ignore backup files and secring.gpg in $BLACKBOXDATA (#169)
+Allow parallel shredding of files (#167)
+* Add/improve Mingw support
+* Make "make confidence" less fragile
+* And a lot, lot more.
 
 Release v1.20170309
 
@@ -24,3 +57,7 @@ Release v1.20170611
 * blackbox_shred_all_files: BUGFIX: Does not shred files with spaces
 * blackbox_removeadmin: disable gpg's confirmation
 * Sync mk_rpm_fpmdir from master
+
+Release v1.20170127
+
+* Starting CHANGELOG.

Makefile

@@ -59,6 +59,13 @@ symlinks-install:
 	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do ln -fs `pwd`/$$f /usr/local/bin/$$f; done
 	@echo 'Done.'
 
+manual-install:
+	@echo '***************************************************************'
+	@echo '*                      DEPRECATED                             *'
+	@echo '* `make manual-install` is now called `make symlinks-install` *'
+	@echo '***************************************************************'
+	$(MAKE) symlinks-install
+
 copy-install:
 	@echo 'Copying files from ./bin to /usr/local/bin'
 	@cd bin && for f in `find . -type f -iname "*" ! -iname "Makefile"`; do cp `pwd`/$$f /usr/local/bin/$$f; done

README.md

@@ -22,11 +22,14 @@ Table of Contents
 - [How to use the secrets with Puppet?](#how-to-use-the-secrets-with-puppet)
   - [Entire files](#entire-files)
   - [Small strings](#small-strings)
-- [How to enroll a new file into the system?](#how-to-enroll-a-new-file-into-the-system)
+- File Management
-- [How to remove a file from the system?](#how-to-remove-a-file-from-the-system)
+  - [How to enroll a new file into the system?](#how-to-enroll-a-new-file-into-the-system)
-- [How to indoctrinate a new user into the system?](#how-to-indoctrinate-a-new-user-into-the-system)
+  - [How to remove a file from the system?](#how-to-remove-a-file-from-the-system)
-- [How to remove a user from the system?](#how-to-remove-a-user-from-the-system)
+- User Management
-- [Enabling BlackBox For a Repo](#enabling-blackbox-for-a-repo)
+  - [How to indoctrinate a new user into the system?](#how-to-indoctrinate-a-new-user-into-the-system)
+  - [How to remove a user from the system?](#how-to-remove-a-user-from-the-system)
+- Repo Management
+  - [Enabling BlackBox For a Repo](#enabling-blackbox-for-a-repo)
 - [Set up automated users or “role accounts”](#set-up-automated-users-or-role-accounts)
 - [Replacing expired keys](#replacing-expired-keys)
 - [Some common errors](#some-common-errors)
@@ -39,7 +42,6 @@ Table of Contents
 - [Alternatives](#alternatives)
 - [License](#license)
 
-
 Overview
 ========
 
@@ -51,7 +53,22 @@ Rather than one GPG passphrase for all the files, each person with access has th
 
 Automated processes often need access to all the decrypted files. This is easy too. For example, suppose Git is being used for Puppet files. The master needs access to the decrypted version of all the files. Simply set up a GPG key for the Puppet master (or the role account that pushes new files to the Puppet master) and have that user run `blackbox_postdeploy` after any files are updated.
 
-Getting started is easy. Just `cd` into a Git, Mercurial, Subversion or Perforce repository and run `blackbox_initialize`. After that, if a file is to be encrypted, run `blackbox_register_new_file` and you are done. Add and remove keys with `blackbox_addadmin` and `blackbox_removeadmin`. To view and/or edit a file, run `blackbox_edit`; this will decrypt the file and open with whatever is specified by your $EDITOR environment variable. When you close the editor the file will automatically be encrypted again and the temporary plaintext file will be shredded. If you need to leave the file decrypted while you update you can use the`blackbox_edit_start` to decrypt the file and `blackbox_edit_end` when you want to "put it back in the box."
+Getting started is looks like this.
+First, if you don't have a GPG key, set it up using instructions
+such as:
+[Set up GPG key](https://help.github.com/articles/generating-a-new-gpg-key/).
+Now you are ready to go.
+`cd` into a Git, Mercurial, Subversion
+or Perforce repository and run `blackbox_initialize`. After that,
+if a file is to be encrypted, run `blackbox_register_new_file` and
+you are done. Add and remove keys with `blackbox_addadmin` and
+`blackbox_removeadmin`. To view and/or edit a file, run `blackbox_edit`;
+this will decrypt the file and open with whatever is specified by
+your $EDITOR environment variable. When you close the editor the
+file will automatically be encrypted again and the temporary plaintext
+file will be shredded. If you need to leave the file decrypted while
+you update you can use the`blackbox_edit_start` to decrypt the file
+and `blackbox_edit_end` when you want to "put it back in the box."
 
 Why is this important?
 ======================
@@ -65,15 +82,16 @@ The ability to be open and transparent about our code, with the exception of a f
 Installation Instructions
 =========================
 
--	*The hard way (manual*: Copy all the files in "bin" to your "bin".
+- *The hard way (manual*: Copy all the files in "bin" to your "bin".
--	*The hard way (automatic)*: `make copy-install` will copy the bin files into /usr/local/bin (uninstall with `make usrlocal-uninstall`).
+- *The hard way (automatic)*: `make copy-install` will copy the bin files into /usr/local/bin (uninstall with `make usrlocal-uninstall`).
--	*The symlinks way*: `make symlinks-install` will make symlinks of the bin files into /usr/local/bin (uninstall with `make usrlocal-uninstall`) (useful when doing development)
+- *The symlinks way*: `make symlinks-install` will make symlinks of the bin files into /usr/local/bin (uninstall with `make usrlocal-uninstall`) (useful when doing development)
--	*The MacPorts Way*: `sudo port install vcs_blackbox`
+- *The MacPorts Way*: `sudo port install vcs_blackbox`
--	*The Homebrew Way*: `brew install blackbox`
+- *The Homebrew Way*: `brew install blackbox`
--	*The RPM way*: Check out the repo and make an RPM via `make packages-rpm`; now you can distribute the RPM via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
+- *The RPM way*: Check out the repo and make an RPM via `make packages-rpm`; now you can distribute the RPM via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
--	*The Debian/Ubuntu way*: Check out the repo and make a DEB via `make packages-deb`; now you can distribute the DEB via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
+- *The Debian/Ubuntu way*: Check out the repo and make a DEB via `make packages-deb`; now you can distribute the DEB via local methods. (Requires [fpm](https://github.com/jordansissel/fpm).)
--	*The Antigen Way*: Add `antigen bundle StackExchange/blackbox` to your .zshrc
+- *The Antigen Way*: Add `antigen bundle StackExchange/blackbox` to your .zshrc
--	*The Zgen Way*: Add `zgen load StackExchange/blackbox` to your .zshrc where you're loading your other plugins.
+- *The Zgen Way*: Add `zgen load StackExchange/blackbox` to your .zshrc where you're loading your other plugins.
+- *The Nix Way*: `nix-env -i blackbox`
 
 Commands
 ========
@@ -84,12 +102,14 @@ Commands
 | `blackbox_edit_start <file>`        | Decrypt a file so it can be updated                                     |
 | `blackbox_edit_end <file>`          | Encrypt a file after blackbox_edit_start was used                       |
 | `blackbox_cat <file>`               | Decrypt and view the contents of a file                                 |
+| `blackbox_view <file>`              | Like blackbox_cat but pipes to `less` or $PAGER                         |
 | `blackbox_diff`                     | Diff decrypted files against their original crypted version             |
 | `blackbox_initialize`               | Enable blackbox for a GIT or HG repo                                    |
 | `blackbox_register_new_file <file>` | Encrypt a file for the first time                                       |
 | `blackbox_deregister_file <file>`   | Remove a file from blackbox                                             |
 | `blackbox_list_files`               | List the files maintained by blackbox                                   |
 | `blackbox_list_admins`              | List admins currently authorized for blackbox                           |
+| `blackbox_decrypt_file <file>`      | Decrypt a file                                                          |
 | `blackbox_decrypt_all_files`        | Decrypt all managed files (INTERACTIVE)                                 |
 | `blackbox_postdeploy`               | Decrypt all managed files (batch)                                       |
 | `blackbox_addadmin <gpg-key>`       | Add someone to the list of people that can encrypt/decrypt secrets      |
@@ -103,17 +123,17 @@ Compatibility
 
 BlackBox automatically determines which VCS you are using and does the right thing. It has a plug-in architecture to make it easy to extend to work with other systems. It has been tested to work with many operating systems.
 
--	Version Control systems
+- Version Control systems
-	-	`git` -- The Git
+  - `git` -- The Git
-	-	`hg` -- Mercurial
+  - `hg` -- Mercurial
-	-	`svn` -- SubVersion (Thanks, Ben Drasin!)
+  - `svn` -- SubVersion (Thanks, Ben Drasin!)
-	-	`p4` -- Perforce
+  - `p4` -- Perforce
-	-	none -- The files can be decrypted outside of a repo if the keyrings directory is intact
+  - none -- The files can be decrypted outside of a repo if the `.blackbox` directory is intact
--	Operating system
+- Operating system
-	-	CentOS / RedHat
+  - CentOS / RedHat
-	-	MacOS X
+  - MacOS X
-	-	Cygwin (Thanks, Ben Drasin!) **See Note Below**
+  - Cygwin (Thanks, Ben Drasin!) **See Note Below**
-	-	MinGW (git bash on windows) **See Note Below**
+  - MinGW (git bash on windows) **See Note Below**
 
 To add or fix support for a VCS system, look for code at the end of `bin/_blackbox_common.sh`
 
@@ -144,14 +164,14 @@ Cygwin support requires the following packages:
 
 Normal operation:
 
--	gnupg
+- gnupg
--	git or mercurial or subversion or perforce (as appropriate)
+- git or mercurial or subversion or perforce (as appropriate)
 
 Development (if you will be adding code and want to run the confidence test)
 
--	procps
+- procps
--	make
+- make
--	git (the confidence test currently only tests git)
+- git (the confidence test currently only tests git)
 
 ### MinGW
 
@@ -159,17 +179,16 @@ MinGW (comes with Git for Windows) support requires the following:
 
 Normal operation:
 
--	[Git for Windows](https://git-scm.com/) (not tested with Mercurial)
+- [Git for Windows](https://git-scm.com/) (not tested with Mercurial)
-	-	Git Bash MINTTY returns a MinGW console.  So when you install make sure you pick `MINTTY` instead of windows console.  You'll be executing blackbox from the Git Bash prompt.
+  - Git Bash MINTTY returns a MinGW console.  So when you install make sure you pick `MINTTY` instead of windows console.  You'll be executing blackbox from the Git Bash prompt.
-	-	You need at least version 2.8.1 of Git for Windows.
+  - You need at least version 2.8.1 of Git for Windows.
--	[GnuWin32](https://sourceforge.net/projects/getgnuwin32/files/) - needed for various tools not least of which is mktemp which is used by blackbox
+- [GnuWin32](https://sourceforge.net/projects/getgnuwin32/files/) - needed for various tools not least of which is mktemp which is used by blackbox
-	-	after downloading the install just provides you with some batch files.  Because of prior issues at sourceforge and to make sure you get the latest version of each package the batch files handle the brunt of the work of getting the correct packages and installing them for you.
+  - after downloading the install just provides you with some batch files.  Because of prior issues at sourceforge and to make sure you get the latest version of each package the batch files handle the brunt of the work of getting the correct packages and installing them for you.
-	-	from a **windows command prompt** run `download.bat`  once it has completed run `install.bat` then add the path for those tools to your PATH (ex: `PATH=%PATH%;c:\GnuWin32\bin`)
+  - from a **windows command prompt** run `download.bat`  once it has completed run `install.bat` then add the path for those tools to your PATH (ex: `PATH=%PATH%;c:\GnuWin32\bin`)
 
 Development:
 
--	unknown (if you develop Blackbox under MinGW, please let us know if any additional packages are required to run `make test`)
+- unknown (if you develop Blackbox under MinGW, please let us know if any additional packages are required to run `make test`)
-
 
 How is the encryption done?
 ===========================
@@ -188,20 +207,20 @@ To remove someone's access, remove that admin's key name (i.e. email address) fr
 
 *If you use Puppet, why didn't you just use hiera-eyaml?* There are 4 reasons:
 
-1.	This works with any Git or Mercurial repo, even if you aren't using Puppet.
+1. This works with any Git or Mercurial repo, even if you aren't using Puppet.
-2.	hiera-eyaml decrypts "on demand" which means your Puppet Master now uses a lot of CPU to decrypt keys every time it is contacted. It slows down your master, which, in my case, is already slow enough.
+2. hiera-eyaml decrypts "on demand" which means your Puppet Master now uses a lot of CPU to decrypt keys every time it is contacted. It slows down your master, which, in my case, is already slow enough.
-3.	This works with binary files, without having to ASCIIify them and paste them into a YAML file. Have you tried to do this with a cert that is 10K long and changes every few weeks? Ick.
+3. This works with binary files, without having to ASCIIify them and paste them into a YAML file. Have you tried to do this with a cert that is 10K long and changes every few weeks? Ick.
-4.	hiera-eyaml didn't exist when I wrote this.
+4. hiera-eyaml didn't exist when I wrote this.
 
 What does this look like to the typical user?
 =============================================
 
--	If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
+- If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
--	Decrypt the file so it is editable: `blackbox_edit_start FILENAME`
+- Decrypt the file so it is editable: `blackbox_edit_start FILENAME`
--	(You will need to enter your GPG passphrase.)
+- (You will need to enter your GPG passphrase.)
--	Edit FILENAME as you desire: `vim FILENAME`
+- Edit FILENAME as you desire: `vim FILENAME`
--	Re-encrypt the file: `blackbox_edit_end FILENAME`
+- Re-encrypt the file: `blackbox_edit_end FILENAME`
--	Commit the changes. `git commit -a` or `hg commit`
+- Commit the changes. `git commit -a` or `hg commit`
 
 Wait... it can be even easier than that! Run `blackbox_edit FILENAME`, and it'll decrypt the file in a temp file and call `$EDITOR` on it, re-encrypting again after the editor is closed.
 
@@ -262,8 +281,8 @@ The variable `$the_password` will contain "my secret password" and can be used a
 How to enroll a new file into the system?
 =========================================
 
--	If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
+- If you need to, start the GPG Agent: `eval $(gpg-agent --daemon)`
--	Add the file to the system:
+- Add the file to the system:
 
 ```
 blackbox_register_new_file path/to/file.name.key
@@ -295,6 +314,8 @@ blackbox_deregister_file path/to/file.name.key
 How to indoctrinate a new user into the system?
 ===============================================
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 `.blackbox/blackbox-admins.txt` is a file that lists which users are able to decrypt files. (More pedantically, it is a list of the GnuPG key names that the file is encrypted for.)
 
 To join the list of people that can edit the file requires three steps; You create a GPG key and add it to the key ring. Then, someone that already has access adds you to the system. Lastly, you should test your access.
@@ -348,7 +369,8 @@ Ask someone that already has access to re-encrypt the data files. This gives you
 Pre-check: Verify the new keys look good.
 
 ```
-$ gpg --homedir=.blackbox --list-keys
+git pull    # Or whatever is required for your system
+gpg --homedir=.blackbox --list-keys
 ```
 
 For example, examine the key name (email address) to make sure it conforms to corporate standards.
@@ -392,16 +414,48 @@ When the command completes, you will be given a reminder to check in the change
 
 Note that their keys will still be in the key ring, but they will go unused. If you'd like to clean up the keyring, use the normal GPG commands and check in the file.
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 ```
 gpg --homedir=.blackbox --list-keys
 gpg --homedir=.blackbox --delete-key olduser@example.com
 git commit -m'Cleaned olduser@example.com from keyring'  .blackbox/*
 ```
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 The key ring only has public keys. There are no secret keys to delete.
 
 Remember that this person did have access to all the secrets at one time. They could have made a copy. Therefore, to be completely secure, you should change all passwords, generate new SSL keys, and so on just like when anyone that had privileged access leaves an organization.
 
+Where is the configuration stored? .blackbox vs. keyrings/live
+==============================================================
+
+Blackbox stores its configuration data in the `.blackbox` subdirectory.  Older
+repos use `keyrings/live`.  For backwards compatibility either will work.
+
+All documentation refers to `.blackbox`.
+
+You can convert an old repo by simply renaming the directory:
+
+```
+mv keyrings/live .blackbox
+rmdir keyrings
+```
+
+There is no technical reason to convert old repos except that it is less
+confusing to users.
+
+This change was made in commit 60e782a0, release v1.20180615.
+
+The details:
+
+- First Blackbox checks `$BLACKBOXDATA`. If this environment variable is set, this is the directory that will be used. If it lists a directory that does not exist, Blackbox will print an error and exit.
+- If `$BLACKBOXDATA` is not set: (which is the typical use case)
+  - Blackbox will first try `keyrings/live` and use it if it exists.
+  - Otherwise the default `.blackbox` will be used.  If `.blackbox` does not exist, Blackbox will print an error and exit.
+
+
 Enabling BlackBox For a Repo
 ============================
 
@@ -409,10 +463,12 @@ Overview:
 
 To add "blackbox" to a git or mercurial repo, you'll need to do the following:
 
-1.	Run the initialize script. This adds a few files to your repo in a directory called "keyrings".
+1. Run the initialize script. This adds a few files to your repo in a directory called ".blackbox".
-2.	For the first user, create a GPG key and add it to the key ring.
+2. For the first user, create a GPG key and add it to the key ring.
-3.	Encrypt the files you want to be "secret".
+3. Encrypt the files you want to be "secret".
-4.	For any automated user (one that must be able to decrypt without a passphrase), create a GPG key and create a subkey with an empty passphrase.
+4. For any automated user (one that must be able to decrypt without a passphrase), create a GPG key and create a subkey with an empty passphrase.
+
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
 
 ### Run the initialize script.
 
@@ -463,6 +519,8 @@ Set up automated users or "role accounts"
 
 i.e. This is how a Puppet Master can have access to the unencrypted data.
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 An automated user (a "role account") is one that that must be able to decrypt without a passphrase. In general you'll want to do this for the user that pulls the files from the repo to the master. This may be automated with Jenkins CI or other CI system.
 
 GPG keys have to have a passphrase. However, passphrases are optional on subkeys. Therefore, we will create a key with a passphrase then create a subkey without a passphrase. Since the subkey is very powerful, it should be created on a very secure machine.
@@ -475,9 +533,9 @@ ProTip: If asked to generate entropy, consider running this on the same machine
 
 For the rest of this doc, you'll need to make the following substitutions:
 
--	ROLEUSER: svc_deployacct or whatever your role account's name is.
+- ROLEUSER: svc_deployacct or whatever your role account's name is.
--	NEWMASTER: the machine this role account exists on.
+- NEWMASTER: the machine this role account exists on.
--	SECUREHOST: The machine you use to create the keys.
+- SECUREHOST: The machine you use to create the keys.
 
 NOTE: This should be more automated/scripted. Patches welcome.
 
@@ -525,9 +583,9 @@ Command> save
 Now securely export this directory to NEWMASTER:
 
 ```
-$ gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
+gpg --homedir . --export -a svc_sadeploy >/tmp/NEWMASTER/pubkey.txt
-$ tar cvf /tmp/keys.tar .
+tar cvf /tmp/keys.tar .
-$ rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
+rsync -avP /tmp/keys.tar NEWMASTER:/tmp/.
 ```
 
 On NEWMASTER, receive the new GnuPG config:
@@ -557,14 +615,14 @@ blackbox_addadmin $KEYNAME /tmp/NEWMASTER
 Verify that secring.gpg is a zero-length file. If it isn't, you have somehow added a private key to the keyring. Start over.
 
 ```
-$ cd .blackbox
+cd .blackbox
-$ ls -l secring.gpg
+ls -l secring.gpg
 ```
 
 Commit the recent changes:
 
 ```
-$ cd .blackbox
+cd .blackbox
 git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.txt
 ```
 
@@ -613,6 +671,8 @@ $ blackbox_edit_end modified_file.txt
 --> Error: can't re-encrypt because a key has expired.
 ```
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 You can also detect keys that are about to expire by issuing this command and manually reviewing the "expired:" dates:
 
     gpg --homedir=.blackbox  --list-keys
@@ -623,7 +683,7 @@ or... list UIDs that will expire within 1 month from today: (Warning: this also
 
 Here's how to replace the key:
 
--	Step 1. Administrator removes expired user:
+- Step 1. Administrator removes expired user:
 
 Warning: This process will erase any unencrypted files that you were in the process of editing. Copy them elsewhere and restore the changes when done.
 
@@ -637,7 +697,7 @@ git commit -m 'Cleaned expired_user@example.com from keyring'  .blackbox/*
 git push
 ```
 
--	Step 2. Expired user adds an updated key:
+- Step 2. Expired user adds an updated key:
 
 ```
 git pull
@@ -646,7 +706,7 @@ git commit -m'NEW ADMIN: updated_user@example.com .blackbox/pubring.gpg .blackbo
 git push
 ```
 
--	Step 3. Administrator re-encrypts all files with the updated key of the expired user:
+- Step 3. Administrator re-encrypts all files with the updated key of the expired user:
 
 ```
 git pull
@@ -656,7 +716,7 @@ git commit -m "Re-encrypt all files"
 git push
 ```
 
--	Step 4: Clean up:
+- Step 4: Clean up:
 
 Any files that were temporarily copied in the first step so as to not be overwritten can now be copied back and re-encrypted with the `blackbox_edit_end` command.
 
@@ -667,11 +727,13 @@ Any files that were temporarily copied in the first step so as to not be overwri
 It's possible to tell Git to decrypt versions of the file before running them through `git diff` or `git log`. To achieve this do:
 
 - Add the following to `.gitattributes` at the top of the git repository:
+
 ```
 *.gpg diff=blackbox
 ```
 
 - Add the following to `.git/config`:
+
 ```
 [diff "blackbox"]
     textconv = gpg --use-agent -q --batch --decrypt
@@ -688,16 +750,18 @@ Some common errors
 
 `Error: can't re-encrypt because a key has expired.` -- A user's key has expired and can't be used to encrypt any more. Follow the [Replace expired keys](#replace-expired-keys) tip.
 
+FYI: Your repo may use `keyrings/live` instead of `.blackbox`. See "Where is the configuration stored?"
+
 Using Blackbox without a repo
 =============================
 
-If the files are copied out of a repo they can still be decrypted and edited. Obviously edits, changes to keys, and such will be lost if they are made outside the repo. Also note that commands are most likely to only work if run from the base directory (i.e. the parent to the keyrings directory).
+If the files are copied out of a repo they can still be decrypted and edited. Obviously edits, changes to keys, and such will be lost if they are made outside the repo. Also note that commands are most likely to only work if run from the base directory (i.e. the parent to the .blackbox directory).
 
 The following commands have been tested outside a repo:
 
--	`blackbox_postdeploy`
+- `blackbox_postdeploy`
--	`blackbox_edit_start`
+- `blackbox_edit_start`
--	`blackbox_edit_end`
+- `blackbox_edit_end`
 
 Some Subversion gotchas
 =======================
@@ -760,14 +824,15 @@ Alternatives
 
 Here are other open source packages that do something similar to BlackBox. If you like them better than BlackBox, please use them.
 
--	[git-crypt](https://www.agwa.name/projects/git-crypt/)
+- [git-crypt](https://www.agwa.name/projects/git-crypt/)
--	[Pass](http://www.zx2c4.com/projects/password-store/)
+- [Pass](http://www.zx2c4.com/projects/password-store/)
--	[Transcrypt](https://github.com/elasticdog/transcrypt)
+- [Transcrypt](https://github.com/elasticdog/transcrypt)
--	[Keyringer](https://keyringer.pw/)
+- [Keyringer](https://keyringer.pw/)
--	[git-secret](https://github.com/sobolevn/git-secret)
+- [git-secret](https://github.com/sobolevn/git-secret)
 
 git-crypt has the best git integration. Once set up it is nearly transparent to the users. However it only works with git.
 
+
 License
 =======
 

RELEASE_ENGINEERING.md

@@ -99,6 +99,7 @@ Submit the diff file as a bug as instructed. The instructions should look like t
 
 Step 3: Watch for the update to happen.
 
+
 Updating MacPorts (manual)
 ==========================
 

bin/_blackbox_common.sh

@@ -16,10 +16,13 @@ source "${0%/*}"/_stack_lib.sh
 : "${BLACKBOX_HOME:="$(cd "${0%/*}" ; pwd)"}" ;
 
 # What are the candidates for the blackbox data directory?
+#
+# The order of candidates matter. The first entry of the array
+# sets the default Blackbox directory for all new repositories.
 declare -a BLACKBOXDATA_CANDIDATES
 BLACKBOXDATA_CANDIDATES=(
-  'keyrings/live'
   '.blackbox'
+  'keyrings/live'
 )
 
 # If $EDITOR is not set, set it to "vi":
@@ -152,7 +155,7 @@ function fail_if_not_on_cryptlist() {
 
   if ! is_on_cryptlist "$name" ; then
     echo "ERROR: $name not found in $BB_FILES" >&2
-    echo "PWD=$(/bin/pwd)" >&2
+    echo "PWD=$(/usr/bin/env pwd)" >&2
     echo 'Exiting...' >&2
     exit 1
   fi

bin/blackbox_decrypt_file

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_decrypt_file -- Decrypt one or more blackbox files.
+#
+
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+if [ $# -eq 0 ]; then
+  echo >&2 "Please provide at least one file to decrypt"
+  exit 1
+fi
+
+"${BLACKBOX_HOME}/blackbox_edit_start" "$@"

bin/blackbox_view

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+#
+# blackbox_view -- Decrypt a file, view it, shred it
+#
+set -e
+source "${0%/*}/_blackbox_common.sh"
+
+for param in "$@" ; do
+  shreddable=0
+  unencrypted_file=$(get_unencrypted_filename "$param")
+  if [[ ! -e "$unencrypted_file" ]]; then
+    "${BLACKBOX_HOME}/blackbox_edit_start" "$param"
+    shreddable=1
+  fi
+  ${PAGER:-less} "$unencrypted_file"
+  if [[ $shreddable = 1 ]]; then
+    shred_file "$unencrypted_file"
+  fi
+done

blackbox.plugin.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 # The MIT License (MIT)
 
 # Copyright (c) 2014 Stack Exchange, Inc.

tools/confidence_test.sh

@@ -5,6 +5,9 @@ export PATH="${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/
 
 export LANG=C.UTF-8  # Required ro "gpg --export" to work properly.
 
+# TODO(tlim): The tests are hardcoded to this directory. This should be fixed.
+export BLACKBOXDATA=keyrings/live
+
 # This script requires many utilities, some are not
 # required by the usual blackbox scripts.  Test to make
 # sure we have them all.

tools/profile.d-usrblackbox-test.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 # Test profile.d-usrblackbox.sh
 

tools/test_functions.sh

@@ -47,7 +47,7 @@ function assert_file_missing() {
 function assert_file_exists() {
   if [[ ! -e "$1" ]]; then
     echo "ASSERT FAILED: ${1} should exist."
-    echo "PWD=$(/bin/pwd -P)"
+    echo "PWD=$(/usr/bin/env pwd -P)"
     #echo "LS START"
     #ls -la
     #echo "LS END"