Only determine key if info is available

src/downloader.c

@@ -1282,6 +1282,10 @@ static void after_request_info(uv_work_t *work, int status)
                 req->state->error_status = STORJ_FILE_UNSUPPORTED_ERASURE;
             }
         }
+
+        // Now that we have info we can calculate the decryption key
+        determine_decryption_key(req->state);
+
     } else if (req->error_status) {
         switch(req->error_status) {
             case STORJ_BRIDGE_REQUEST_ERROR:
@@ -1300,9 +1304,6 @@ static void after_request_info(uv_work_t *work, int status)
         req->state->error_status = STORJ_BRIDGE_FILEINFO_ERROR;
     }
 
-    // Now that we have info we can calculate the decryption key
-    determine_decryption_key(req->state);
-
     queue_next_work(req->state);
 
     free(req);

src/storj.h

@@ -102,7 +102,7 @@ extern "C" {
 #define STORJ_SHARD_CHALLENGES 4
 #define STORJ_LOW_SPEED_LIMIT 30720L
 #define STORJ_LOW_SPEED_TIME 20L
-#define STORJ_HTTP_TIMEOUT 20L
+#define STORJ_HTTP_TIMEOUT 60L
 
 typedef struct {
   uint8_t *encryption_ctr;