1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,24 @@ |
1 |
+/* |
|
2 |
+ * Copyright 2017 Andrey Semashev |
|
3 |
+ * |
|
4 |
+ * Distributed under the Boost Software License, Version 1.0. |
|
5 |
+ * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
+ * |
|
7 |
+ * This header is deprecated, use boost/winapi/crypt.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
11 |
+#define BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/crypt.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/crypt.hpp> |
|
18 |
+#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
+ |
|
20 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
+#pragma once |
|
22 |
+#endif |
|
23 |
+ |
|
24 |
+#endif // BOOST_DETAIL_WINAPI_CRYPT_HPP |
1 | 1 |
deleted file mode 100755 |
... | ... |
@@ -1,24 +0,0 @@ |
1 |
-/* |
|
2 |
- * Copyright 2017 Andrey Semashev |
|
3 |
- * |
|
4 |
- * Distributed under the Boost Software License, Version 1.0. |
|
5 |
- * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
- * |
|
7 |
- * This header is deprecated, use boost/winapi/crypt.hpp instead. |
|
8 |
- */ |
|
9 |
- |
|
10 |
-#ifndef BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
11 |
-#define BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
12 |
- |
|
13 |
-#include <boost/config/header_deprecated.hpp> |
|
14 |
- |
|
15 |
-BOOST_HEADER_DEPRECATED("<boost/winapi/crypt.hpp>") |
|
16 |
- |
|
17 |
-#include <boost/winapi/crypt.hpp> |
|
18 |
-#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
- |
|
20 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
-#pragma once |
|
22 |
-#endif |
|
23 |
- |
|
24 |
-#endif // BOOST_DETAIL_WINAPI_CRYPT_HPP |
1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,24 @@ |
1 |
+/* |
|
2 |
+ * Copyright 2017 Andrey Semashev |
|
3 |
+ * |
|
4 |
+ * Distributed under the Boost Software License, Version 1.0. |
|
5 |
+ * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
+ * |
|
7 |
+ * This header is deprecated, use boost/winapi/crypt.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
11 |
+#define BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/crypt.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/crypt.hpp> |
|
18 |
+#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
+ |
|
20 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
+#pragma once |
|
22 |
+#endif |
|
23 |
+ |
|
24 |
+#endif // BOOST_DETAIL_WINAPI_CRYPT_HPP |
From: Laurent <lg390@cam.ac.uk>
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@125180 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,88 +0,0 @@ |
1 |
-// crypt.hpp --------------------------------------------------------------// |
|
2 |
- |
|
3 |
-// Copyright 2014 Antony Polukhin |
|
4 |
- |
|
5 |
-// Distributed under the Boost Software License, Version 1.0. |
|
6 |
-// See http://www.boost.org/LICENSE_1_0.txt |
|
7 |
- |
|
8 |
- |
|
9 |
-#ifndef BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
10 |
-#define BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
11 |
- |
|
12 |
-#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
- |
|
14 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
-#pragma once |
|
16 |
-#endif |
|
17 |
- |
|
18 |
-namespace boost |
|
19 |
-{ |
|
20 |
-namespace detail |
|
21 |
-{ |
|
22 |
-namespace winapi |
|
23 |
-{ |
|
24 |
-#if defined( BOOST_USE_WINDOWS_H ) |
|
25 |
- typedef HCRYPTPROV HCRYPTPROV_; |
|
26 |
- |
|
27 |
- using ::CryptEnumProvidersA; |
|
28 |
- using ::CryptAcquireContextA; |
|
29 |
- using ::CryptGenRandom; |
|
30 |
- using ::CryptReleaseContext; |
|
31 |
- |
|
32 |
- const DWORD_ PROV_RSA_FULL_ = PROV_RSA_FULL; |
|
33 |
- |
|
34 |
- const DWORD_ CRYPT_VERIFYCONTEXT_ = CRYPT_VERIFYCONTEXT; |
|
35 |
- const DWORD_ CRYPT_NEWKEYSET_ = CRYPT_NEWKEYSET; |
|
36 |
- const DWORD_ CRYPT_DELETEKEYSET_ = CRYPT_DELETEKEYSET; |
|
37 |
- const DWORD_ CRYPT_MACHINE_KEYSET_ = CRYPT_MACHINE_KEYSET; |
|
38 |
- const DWORD_ CRYPT_SILENT_ = CRYPT_SILENT; |
|
39 |
-#else |
|
40 |
-extern "C" { |
|
41 |
- typedef ULONG_PTR_ HCRYPTPROV_; |
|
42 |
- |
|
43 |
- __declspec(dllimport) BOOL_ __stdcall |
|
44 |
- CryptEnumProvidersA( |
|
45 |
- DWORD_ dwIndex, |
|
46 |
- DWORD_ *pdwReserved, |
|
47 |
- DWORD_ dwFlags, |
|
48 |
- DWORD_ *pdwProvType, |
|
49 |
- LPSTR_ szProvName, |
|
50 |
- DWORD_ *pcbProvName |
|
51 |
- ); |
|
52 |
- |
|
53 |
- __declspec(dllimport) BOOL_ __stdcall |
|
54 |
- CryptAcquireContextA( |
|
55 |
- HCRYPTPROV_ *phProv, |
|
56 |
- LPCSTR_ pszContainer, |
|
57 |
- LPCSTR_ pszProvider, |
|
58 |
- DWORD_ dwProvType, |
|
59 |
- DWORD_ dwFlags |
|
60 |
- ); |
|
61 |
- |
|
62 |
- __declspec(dllimport) BOOL_ __stdcall |
|
63 |
- CryptGenRandom( |
|
64 |
- HCRYPTPROV_ hProv, |
|
65 |
- DWORD_ dwLen, |
|
66 |
- BYTE_ *pbBuffer |
|
67 |
- ); |
|
68 |
- |
|
69 |
- __declspec(dllimport) BOOL_ __stdcall |
|
70 |
- CryptReleaseContext( |
|
71 |
- HCRYPTPROV_ hProv, |
|
72 |
- DWORD_ dwFlags |
|
73 |
- ); |
|
74 |
- |
|
75 |
- const DWORD_ PROV_RSA_FULL_ = 1; |
|
76 |
- |
|
77 |
- const DWORD_ CRYPT_VERIFYCONTEXT_ = 0xF0000000; |
|
78 |
- const DWORD_ CRYPT_NEWKEYSET_ = 8; |
|
79 |
- const DWORD_ CRYPT_DELETEKEYSET_ = 16; |
|
80 |
- const DWORD_ CRYPT_MACHINE_KEYSET_ = 32; |
|
81 |
- const DWORD_ CRYPT_SILENT_ = 64; |
|
82 |
-} |
|
83 |
-#endif |
|
84 |
-} |
|
85 |
-} |
|
86 |
-} |
|
87 |
- |
|
88 |
-#endif // BOOST_DETAIL_WINAPI_CRYPT_HPP |
Commit id: 0b3d4d9bb71e3ca5891b777610fc8dec103a6d61
Bumped version after KK's updates
Commit id: 9e04409b64757a177893d56c0300904f31945cb1
modified: src/pwiz/data/common/BinaryIndexStream.cpp modified: src/win/i386/libpwiz.a modified: src/win/x64/libpwiz.a
Commit id: f16b04258dc20bf3315beac99708e11728cfc12b
update precompiled lib for windows
Commit id: 5d56197f1148378d92e89b2d0a167e18c4b7ab2e
Bump version, tame .Rbuildignore
Commit id: 432da5bd294c9b87f7761e15bc814c3785c21abf
Merge remote-tracking branch 'origin/boost_159'
Commit id: 92be978bf72d90c2222a19ddf365f6d1acc9f20d
upadte Makevars
Commit id: ae75037a780cead56c4d20bedf822c94fb413677
upgrade to boost 1.5.9
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@110126 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,88 @@ |
1 |
+// crypt.hpp --------------------------------------------------------------// |
|
2 |
+ |
|
3 |
+// Copyright 2014 Antony Polukhin |
|
4 |
+ |
|
5 |
+// Distributed under the Boost Software License, Version 1.0. |
|
6 |
+// See http://www.boost.org/LICENSE_1_0.txt |
|
7 |
+ |
|
8 |
+ |
|
9 |
+#ifndef BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
10 |
+#define BOOST_DETAIL_WINAPI_CRYPT_HPP |
|
11 |
+ |
|
12 |
+#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
+ |
|
14 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
+#pragma once |
|
16 |
+#endif |
|
17 |
+ |
|
18 |
+namespace boost |
|
19 |
+{ |
|
20 |
+namespace detail |
|
21 |
+{ |
|
22 |
+namespace winapi |
|
23 |
+{ |
|
24 |
+#if defined( BOOST_USE_WINDOWS_H ) |
|
25 |
+ typedef HCRYPTPROV HCRYPTPROV_; |
|
26 |
+ |
|
27 |
+ using ::CryptEnumProvidersA; |
|
28 |
+ using ::CryptAcquireContextA; |
|
29 |
+ using ::CryptGenRandom; |
|
30 |
+ using ::CryptReleaseContext; |
|
31 |
+ |
|
32 |
+ const DWORD_ PROV_RSA_FULL_ = PROV_RSA_FULL; |
|
33 |
+ |
|
34 |
+ const DWORD_ CRYPT_VERIFYCONTEXT_ = CRYPT_VERIFYCONTEXT; |
|
35 |
+ const DWORD_ CRYPT_NEWKEYSET_ = CRYPT_NEWKEYSET; |
|
36 |
+ const DWORD_ CRYPT_DELETEKEYSET_ = CRYPT_DELETEKEYSET; |
|
37 |
+ const DWORD_ CRYPT_MACHINE_KEYSET_ = CRYPT_MACHINE_KEYSET; |
|
38 |
+ const DWORD_ CRYPT_SILENT_ = CRYPT_SILENT; |
|
39 |
+#else |
|
40 |
+extern "C" { |
|
41 |
+ typedef ULONG_PTR_ HCRYPTPROV_; |
|
42 |
+ |
|
43 |
+ __declspec(dllimport) BOOL_ __stdcall |
|
44 |
+ CryptEnumProvidersA( |
|
45 |
+ DWORD_ dwIndex, |
|
46 |
+ DWORD_ *pdwReserved, |
|
47 |
+ DWORD_ dwFlags, |
|
48 |
+ DWORD_ *pdwProvType, |
|
49 |
+ LPSTR_ szProvName, |
|
50 |
+ DWORD_ *pcbProvName |
|
51 |
+ ); |
|
52 |
+ |
|
53 |
+ __declspec(dllimport) BOOL_ __stdcall |
|
54 |
+ CryptAcquireContextA( |
|
55 |
+ HCRYPTPROV_ *phProv, |
|
56 |
+ LPCSTR_ pszContainer, |
|
57 |
+ LPCSTR_ pszProvider, |
|
58 |
+ DWORD_ dwProvType, |
|
59 |
+ DWORD_ dwFlags |
|
60 |
+ ); |
|
61 |
+ |
|
62 |
+ __declspec(dllimport) BOOL_ __stdcall |
|
63 |
+ CryptGenRandom( |
|
64 |
+ HCRYPTPROV_ hProv, |
|
65 |
+ DWORD_ dwLen, |
|
66 |
+ BYTE_ *pbBuffer |
|
67 |
+ ); |
|
68 |
+ |
|
69 |
+ __declspec(dllimport) BOOL_ __stdcall |
|
70 |
+ CryptReleaseContext( |
|
71 |
+ HCRYPTPROV_ hProv, |
|
72 |
+ DWORD_ dwFlags |
|
73 |
+ ); |
|
74 |
+ |
|
75 |
+ const DWORD_ PROV_RSA_FULL_ = 1; |
|
76 |
+ |
|
77 |
+ const DWORD_ CRYPT_VERIFYCONTEXT_ = 0xF0000000; |
|
78 |
+ const DWORD_ CRYPT_NEWKEYSET_ = 8; |
|
79 |
+ const DWORD_ CRYPT_DELETEKEYSET_ = 16; |
|
80 |
+ const DWORD_ CRYPT_MACHINE_KEYSET_ = 32; |
|
81 |
+ const DWORD_ CRYPT_SILENT_ = 64; |
|
82 |
+} |
|
83 |
+#endif |
|
84 |
+} |
|
85 |
+} |
|
86 |
+} |
|
87 |
+ |
|
88 |
+#endif // BOOST_DETAIL_WINAPI_CRYPT_HPP |