Skip to content

Commit 6247c1e

Browse files
authored
Merge pull request fireice-uk#93 from fireice-uk/master
Bring dev up to speed
2 parents 620cd67 + 26c0134 commit 6247c1e

File tree

2 files changed

+47
-53
lines changed

2 files changed

+47
-53
lines changed

README.md

+47-47
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ Hash: SHA256
1717
sha1sum
1818
d34a0ba0dd7b3b1f900a7e02772e197e974b4a73 libeay32.dll
1919
2ee9966a0fc163da58408d91be36b84fa287c10b ssleay32.dll
20-
c406d5fbe4791b73271ab17a9b720fd15bcf5235 xmr-stak-cpu.exe
21-
a6a63f70e19819ef9f65603267308ad9360c8256 xmr-stak-cpu-notls.exe
20+
eb8f162dae5c400c522c1ca66f2400ff28fa3220 xmr-stak-cpu.exe
21+
2ae97065577820e26c097665c2ebc462a55b76f2 xmr-stak-cpu-notls.exe
2222
2323
sha3sum
2424
05003137a87313c81d6c348c9b96411c95d48dc22c35f36c39129747 libeay32.dll
2525
133c065d9ef2c93396382e2ba5d8c3ca8c6a57c6beb0159cb9a4b6c5 ssleay32.dll
26-
4d57aec0df1a9a3cb843b49aaebef3546fedd17a6adf7de77890909f xmr-stak-cpu.exe
27-
739e68fe4f76fe5d4ff314693f28baf0a166ca8e46dee0b0cd044370 xmr-stak-cpu-notls.exe
26+
f4fa6698eb71a8839bab36be0924d67f3436f6c6843962b480d54cb9 xmr-stak-cpu.exe
27+
527fef186d888997a8d7c703acfae9589f11601015e9a91f593d8431 xmr-stak-cpu-notls.exe
2828
29-
$ date
30-
Wed 15 Mar 14:39:01 GMT 2017
29+
date
30+
Wed 26 Apr 22:25:44 BST 2017
3131
-----BEGIN PGP SIGNATURE-----
3232
Version: GnuPG v2
3333
34-
iQEcBAEBCAAGBQJYyVJUAAoJEPsk95p+1Bw0sNIIAIPISmp5ut/zb7rlnbfxkrZf
35-
PRuNF1g7+qMen1bUi9FTwoTeebz468kj+fbk8fKljYMyctOrgxbTkPFl7ag1k1UH
36-
rjeiRMVWlw0FBEX+0n9D9Ots+whYmwYXXu8eXJFjyc9nzRxzJl//hLw7ASpwOBRx
37-
C+HcFXJSEcUr5RcDxAR0jK0xHQiu82mp4QxxR1GpIRWfsbqQn+OOClhtedLFed/Y
38-
rXivP2XH0SEAhZfa/JUMCcwkqldMOKotZqhZwOjLLGWkKGYUM04U9N58bGIg7tDj
39-
lBoYbHZRpcWUfDO8o2y+ZQIs+yzMoJHHBBXB9fsHlwq62PTtzjsEVwB2aq9ABzk=
40-
=S8cQ
34+
iQEcBAEBCAAGBQJZARCzAAoJEPsk95p+1Bw0NbUH/A1F7BU7z6RswiPhMem5iYXw
35+
kflEGCIA+afBRFBwncqulhJBt7G/dqpAzyopHz2GeY2Ga74Bb7onHhC0K7xdUFLs
36+
mmOf1GNSywzmz4+x55bffgehnr5e7DLIn0sqPcci+Cvbaxep8bkcAlLA6oljiliW
37+
zb9iruPw4Kqd19sLPQAZJTW4BMb8lDdBKm3a7BOMn3uHvWb45EkG670arqcy20Wh
38+
4IeHbXWmqmvmgT46J1dvsjGBAMysGG8dop1FO7tegHRz/QQM6ndA0MonGR+BR+ij
39+
7c7UkISostwzVkfWKvAYyV6hBC3sSVahn5DzBiKTO5HomRCd/GL/Wwa3hecHVFs=
40+
=1USM
4141
-----END PGP SIGNATURE-----
4242
4343
```
@@ -87,40 +87,6 @@ psychocrypt:
8787
43NoJVEXo21hGZ6tDG6Z3g4qimiGdJPE6GRxAmiWwm26gwr62Lqo7zRiCJFSBmbkwTGNuuES9ES5TgaVHceuYc4Y75txCTU
8888
```
8989

90-
## PGP Key
91-
```
92-
-----BEGIN PGP PUBLIC KEY BLOCK-----
93-
Version: GnuPG v2
94-
95-
mQENBFhYUmUBCAC6493W5y1MMs38ApRbI11jWUqNdFm686XLkZWGDfYImzL6pEYk
96-
RdWkyt9ziCyA6NUeWFQYniv/z10RxYKq8ulVVJaKb9qPGMU0ESfdxlFNJkU/pf28
97-
sEVBagGvGw8uFxjQONnBJ7y7iNRWMN7qSRS636wN5ryTHNsmqI4ClXPHkXkDCDUX
98-
QvhXZpG9RRM6jsE3jBGz/LJi3FyZLo/vB60OZBODJ2IA0wSR41RRiOq01OqDueva
99-
9jPoAokNglJfn/CniQ+lqUEXj1vjAZ1D5Mn9fISzA/UPen5Z7Sipaa9aAtsDBOfP
100-
K9iPKOsWa2uTafoyXgiwEVXCCeMMUjCGaoFBABEBAAG0ImZpcmVpY2VfdWsgPGZp
101-
cmVpY2UueG1yQGdtYWlsLmNvbT6JATcEEwEIACEFAlhYUmUCGwMFCwkIBwIGFQgJ
102-
CgsCBBYCAwECHgECF4AACgkQ+yT3mn7UHDTEcQf8CMhqaZ0IOBxeBnsq5HZr2X6z
103-
E5bODp5cPs6ha1tjH3CWpk1AFeykNtXH7kPW9hcDt/e4UQtcHs+lu6YU59X7xLJQ
104-
udOkpWdmooJMXRWS/zeeon4ivT9d69jNnwubh8EJOyw8xm/se6n48BcewfHekW/6
105-
mVrbhLbF1dnuUGXzRN1WxsUZx3uJd2UvrkJhAtHtX92/qIVhT0+3PXV0bmpHURlK
106-
YKhhm8dPLV9jPX8QVRHQXCOHSMqy/KoWEe6CnT0Isbkq3JtS3K4VBVeTX9gkySRc
107-
IFxrNJdXsI9BxKv4O8yajP8DohpoGLMDKZKSO0yq0BRMgMh0cw6Lk22uyulGALkB
108-
DQRYWFJlAQgAqikfViOmIccCZKVMZfNHjnigKtQqNrbJpYZCOImql4FqbZu9F7TD
109-
9HIXA43SPcwziWlyazSy8Pa9nCpc6PuPPO1wxAaNIc5nt+w/x2EGGTIFGjRoubmP
110-
3i5jZzOFYsvR2W3PgVa3/ujeYYJYo1oeVeuGmmJRejs0rp1mbvBSKw1Cq6C4cI0x
111-
GTY1yXFGLIgdfYNMmiLsTy1Qwq8YStbFKeUYAMMG3128SAIaT3Eet911f5Jx4tC8
112-
6kWUr6PX1rQ0LQJqyIsLq9U53XybUksRfJC9IEfgvgBxRBHSD8WfqEhHjhW1VsZG
113-
dcYgr7A1PIneWsCEY+5VUnqTlt2HPaKweQARAQABiQEfBBgBCAAJBQJYWFJlAhsM
114-
AAoJEPsk95p+1Bw0Pr8H/0vZ6U2zaih03jOHOvsrYxRfDXSmgudOp1VS45aHIREd
115-
2nrJ+drleeFVyb14UQqO/6iX9GuDX2yBEHdCg2aljeP98AaMU//RiEtebE6CUWsL
116-
HPVXHIkxwBCBe0YkJINHUQqLz/5f6qLsNUp1uTH2++zhdBWvg+gErTYbx8aFMFYH
117-
0GoOtqE5rtlAh5MTvDZm+UcDwKJCxhrLaN3R3dDoyrDNRTgHQQuX5/opJBiUnVNK
118-
d+vugnxzpMIJQP11yCZkz/KxV8zQ2QPMuZdAoh3znd/vGCJcp0rWphn4pqxA4vDp
119-
c4hC0Yg9Dha1OoE5CJCqVL+ic4vAyB1urAwBlsd/wH8=
120-
=B5I+
121-
-----END PGP PUBLIC KEY BLOCK-----
122-
```
123-
12490
## Common Issues
12591

12692
**SeLockMemoryPrivilege failed**
@@ -208,3 +174,37 @@ and install.
208174
- `OpenSSL_REQUIRED`allow to disable/enable the dependency *OpenSSL*
209175
- by default enabled
210176
- it is not possible to connect to a *https* secured pool if optin is disabled: `cmake . -DOpenSSL_REQUIRED=OFF`
177+
178+
## PGP Key
179+
```
180+
-----BEGIN PGP PUBLIC KEY BLOCK-----
181+
Version: GnuPG v2
182+
183+
mQENBFhYUmUBCAC6493W5y1MMs38ApRbI11jWUqNdFm686XLkZWGDfYImzL6pEYk
184+
RdWkyt9ziCyA6NUeWFQYniv/z10RxYKq8ulVVJaKb9qPGMU0ESfdxlFNJkU/pf28
185+
sEVBagGvGw8uFxjQONnBJ7y7iNRWMN7qSRS636wN5ryTHNsmqI4ClXPHkXkDCDUX
186+
QvhXZpG9RRM6jsE3jBGz/LJi3FyZLo/vB60OZBODJ2IA0wSR41RRiOq01OqDueva
187+
9jPoAokNglJfn/CniQ+lqUEXj1vjAZ1D5Mn9fISzA/UPen5Z7Sipaa9aAtsDBOfP
188+
K9iPKOsWa2uTafoyXgiwEVXCCeMMUjCGaoFBABEBAAG0ImZpcmVpY2VfdWsgPGZp
189+
cmVpY2UueG1yQGdtYWlsLmNvbT6JATcEEwEIACEFAlhYUmUCGwMFCwkIBwIGFQgJ
190+
CgsCBBYCAwECHgECF4AACgkQ+yT3mn7UHDTEcQf8CMhqaZ0IOBxeBnsq5HZr2X6z
191+
E5bODp5cPs6ha1tjH3CWpk1AFeykNtXH7kPW9hcDt/e4UQtcHs+lu6YU59X7xLJQ
192+
udOkpWdmooJMXRWS/zeeon4ivT9d69jNnwubh8EJOyw8xm/se6n48BcewfHekW/6
193+
mVrbhLbF1dnuUGXzRN1WxsUZx3uJd2UvrkJhAtHtX92/qIVhT0+3PXV0bmpHURlK
194+
YKhhm8dPLV9jPX8QVRHQXCOHSMqy/KoWEe6CnT0Isbkq3JtS3K4VBVeTX9gkySRc
195+
IFxrNJdXsI9BxKv4O8yajP8DohpoGLMDKZKSO0yq0BRMgMh0cw6Lk22uyulGALkB
196+
DQRYWFJlAQgAqikfViOmIccCZKVMZfNHjnigKtQqNrbJpYZCOImql4FqbZu9F7TD
197+
9HIXA43SPcwziWlyazSy8Pa9nCpc6PuPPO1wxAaNIc5nt+w/x2EGGTIFGjRoubmP
198+
3i5jZzOFYsvR2W3PgVa3/ujeYYJYo1oeVeuGmmJRejs0rp1mbvBSKw1Cq6C4cI0x
199+
GTY1yXFGLIgdfYNMmiLsTy1Qwq8YStbFKeUYAMMG3128SAIaT3Eet911f5Jx4tC8
200+
6kWUr6PX1rQ0LQJqyIsLq9U53XybUksRfJC9IEfgvgBxRBHSD8WfqEhHjhW1VsZG
201+
dcYgr7A1PIneWsCEY+5VUnqTlt2HPaKweQARAQABiQEfBBgBCAAJBQJYWFJlAhsM
202+
AAoJEPsk95p+1Bw0Pr8H/0vZ6U2zaih03jOHOvsrYxRfDXSmgudOp1VS45aHIREd
203+
2nrJ+drleeFVyb14UQqO/6iX9GuDX2yBEHdCg2aljeP98AaMU//RiEtebE6CUWsL
204+
HPVXHIkxwBCBe0YkJINHUQqLz/5f6qLsNUp1uTH2++zhdBWvg+gErTYbx8aFMFYH
205+
0GoOtqE5rtlAh5MTvDZm+UcDwKJCxhrLaN3R3dDoyrDNRTgHQQuX5/opJBiUnVNK
206+
d+vugnxzpMIJQP11yCZkz/KxV8zQ2QPMuZdAoh3znd/vGCJcp0rWphn4pqxA4vDp
207+
c4hC0Yg9Dha1OoE5CJCqVL+ic4vAyB1urAwBlsd/wH8=
208+
=B5I+
209+
-----END PGP PUBLIC KEY BLOCK-----
210+
```

jconf.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,6 @@ bool jconf::GetThreadConfig(size_t id, thd_cfg &cfg)
144144
cfg.bDoubleMode = mode->GetBool();
145145
cfg.bNoPrefetch = no_prefetch->GetBool();
146146

147-
if(!bHaveAes && cfg.bDoubleMode)
148-
{
149-
printer::inst()->print_msg(L0, "Invalid thread confg - low_power_mode are unsupported on CPUs without AES-NI.");
150-
return false;
151-
}
152-
153147
if(aff->IsNumber())
154148
cfg.iCpuAff = aff->GetInt64();
155149
else

0 commit comments

Comments
 (0)