From 79ce5537ab12ec7678b3ea08ecd60faf3a12af01 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 28 Jul 2020 11:47:05 +0200
Subject: [PATCH] signer/storage: fix a badly ordered error check (#21379)

---
 cmd/clef/docs/setup.md            | 2 +-
 cmd/faucet/faucet.html            | 2 +-
 signer/storage/aes_gcm_storage.go | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/clef/docs/setup.md b/cmd/clef/docs/setup.md
index d66a0d950..6cc7a4120 100644
--- a/cmd/clef/docs/setup.md
+++ b/cmd/clef/docs/setup.md
@@ -94,7 +94,7 @@ with minimal requirements.
 On the `client` qube, we need to create a listener which will receive the request from the Dapp, and proxy it. 
 
 
-[qubes-client.py](qubes/client/qubes-client.py):
+[qubes-client.py](qubes/qubes-client.py):
 
 ```python
 
diff --git a/cmd/faucet/faucet.html b/cmd/faucet/faucet.html
index 314b19e12..ba1433318 100644
--- a/cmd/faucet/faucet.html
+++ b/cmd/faucet/faucet.html
@@ -49,7 +49,7 @@
 				<div class="row">
 					<div class="col-lg-8 col-lg-offset-2">
 						<div class="input-group">
-							<input id="url" name="url" type="text" class="form-control" placeholder="Social network URL containing your Ethereum address...">
+							<input id="url" name="url" type="text" class="form-control" placeholder="Social network URL containing your Ethereum address..."/>
 							<span class="input-group-btn">
 								<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Give me Ether	<i class="fa fa-caret-down" aria-hidden="true"></i></button>
 				        <ul class="dropdown-menu dropdown-menu-right">{{range $idx, $amount := .Amounts}}
diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go
index 8c5e147ac..1dad34a3e 100644
--- a/signer/storage/aes_gcm_storage.go
+++ b/signer/storage/aes_gcm_storage.go
@@ -151,11 +151,11 @@ func encrypt(key []byte, plaintext []byte, additionalData []byte) ([]byte, []byt
 		return nil, nil, err
 	}
 	aesgcm, err := cipher.NewGCM(block)
-	nonce := make([]byte, aesgcm.NonceSize())
-	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
+	if err != nil {
 		return nil, nil, err
 	}
-	if err != nil {
+	nonce := make([]byte, aesgcm.NonceSize())
+	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
 		return nil, nil, err
 	}
 	ciphertext := aesgcm.Seal(nil, nonce, plaintext, additionalData)