From af4a9ba6adc3dacfd6523e040e6f547b9a83fb96 Mon Sep 17 00:00:00 2001
From: evilaliv3 <giovanni.pellerano@evilaliv3.org>
Date: Fri, 22 Jan 2016 22:46:14 +0100
Subject: [PATCH] Revert few of the changes done in
 https://github.com/openpgpjs/openpgpjs/commit/a4598f3bd4a7725c645841c736ee17e6d04073e6

---
 test/crypto/cipher/aes.js      | 2 +-
 test/crypto/cipher/blowfish.js | 2 +-
 test/crypto/cipher/cast5.js    | 2 +-
 test/crypto/cipher/des.js      | 2 +-
 test/crypto/cipher/twofish.js  | 2 +-
 test/crypto/crypto.js          | 2 +-
 test/crypto/hash/md5.js        | 2 +-
 test/crypto/hash/ripemd.js     | 2 +-
 test/crypto/hash/sha.js        | 2 +-
 test/general/armor.js          | 2 +-
 test/general/basic.js          | 2 +-
 test/general/hkp.js            | 2 +-
 test/general/key.js            | 2 +-
 test/general/keyring.js        | 2 +-
 test/general/packet.js         | 2 +-
 test/general/signature.js      | 2 +-
 test/worker/api.js             | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/crypto/cipher/aes.js b/test/crypto/cipher/aes.js
index 6cc1f3ca..833e3f90 100644
--- a/test/crypto/cipher/aes.js
+++ b/test/crypto/cipher/aes.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/blowfish.js b/test/crypto/cipher/blowfish.js
index 81100dd7..2600a06b 100644
--- a/test/crypto/cipher/blowfish.js
+++ b/test/crypto/cipher/blowfish.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   BFencrypt = openpgp.crypto.cipher.blowfish,
diff --git a/test/crypto/cipher/cast5.js b/test/crypto/cipher/cast5.js
index 40ab972e..6a222fde 100644
--- a/test/crypto/cipher/cast5.js
+++ b/test/crypto/cipher/cast5.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/des.js b/test/crypto/cipher/des.js
index 1be7e80f..64149e23 100644
--- a/test/crypto/cipher/des.js
+++ b/test/crypto/cipher/des.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/twofish.js b/test/crypto/cipher/twofish.js
index e2ee828c..0ad46dde 100644
--- a/test/crypto/cipher/twofish.js
+++ b/test/crypto/cipher/twofish.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/crypto.js b/test/crypto/crypto.js
index f7dec980..60afa1c8 100644
--- a/test/crypto/crypto.js
+++ b/test/crypto/crypto.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/crypto/hash/md5.js b/test/crypto/hash/md5.js
index b3d0a777..fb431b0a 100644
--- a/test/crypto/hash/md5.js
+++ b/test/crypto/hash/md5.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   MD5 = openpgp.crypto.hash.md5,
diff --git a/test/crypto/hash/ripemd.js b/test/crypto/hash/ripemd.js
index 75c353c9..df153e04 100644
--- a/test/crypto/hash/ripemd.js
+++ b/test/crypto/hash/ripemd.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   RMDstring = openpgp.crypto.hash.ripemd,
diff --git a/test/crypto/hash/sha.js b/test/crypto/hash/sha.js
index ce8da58a..cd4166d0 100644
--- a/test/crypto/hash/sha.js
+++ b/test/crypto/hash/sha.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
 
 var util = openpgp.util,
   hash = openpgp.crypto.hash,
diff --git a/test/general/armor.js b/test/general/armor.js
index 69ce787f..22535b17 100644
--- a/test/general/armor.js
+++ b/test/general/armor.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/basic.js b/test/general/basic.js
index ef9857ca..2ecd584d 100644
--- a/test/general/basic.js
+++ b/test/general/basic.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/hkp.js b/test/general/hkp.js
index cbe71bcd..3f0757c0 100644
--- a/test/general/hkp.js
+++ b/test/general/hkp.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 var fetch = typeof window !== 'undefined' ? window.fetch : require('node-fetch');
 
 var chai = require('chai'),
diff --git a/test/general/key.js b/test/general/key.js
index e3be1c32..044ed38d 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/general/keyring.js b/test/general/keyring.js
index cc770d4b..e8c4d311 100644
--- a/test/general/keyring.js
+++ b/test/general/keyring.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var keyring = new openpgp.Keyring(),
   chai = require('chai'),
diff --git a/test/general/packet.js b/test/general/packet.js
index 250c7dfe..e32ba5ab 100644
--- a/test/general/packet.js
+++ b/test/general/packet.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/signature.js b/test/general/signature.js
index 466a1036..33dbb9ea 100644
--- a/test/general/signature.js
+++ b/test/general/signature.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/worker/api.js b/test/worker/api.js
index d23d8a60..9be31c7d 100644
--- a/test/worker/api.js
+++ b/test/worker/api.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
 
 var chai = require('chai'),
   expect = chai.expect;