Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8289275: Remove incorrect __declspec(dllimport) attributes from pointers in jdk.crypto.cryptoki #9353

Closed
wants to merge 4 commits into from
Closed

8289275: Remove incorrect __declspec(dllimport) attributes from pointers in jdk.crypto.cryptoki #9353

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f299e7c
Remove __declspec(dllimport) from pointers
TheShermanTanker Jun 28, 2022
f6a94f4
Merge branch 'master' into typedefs
TheShermanTanker Jul 9, 2022
f011550
Merge branch 'master' into typedefs
TheShermanTanker Jul 14, 2022
3babccb
Revert changes to pkcs11.h
TheShermanTanker Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ extern "C" {
* functions in a Win32 Cryptoki .dll, in might be defined by:
*
* #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
* returnType __declspec(dllimport) (* name)
* returnType (* name)
*
* In a UNIX environment, it might be defined by:
*
Expand Down
10 changes: 5 additions & 5 deletions src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h
View file
Open in desktop
Expand Up @@ -31,8 +31,8 @@
// const char *certPrefix, const char *keyPrefix,
// const char *secmodName, PRUint32 flags);

typedef int __declspec(dllimport) (*FPTR_VersionCheck)(const char *importedVersion);
typedef int __declspec(dllimport) (*FPTR_Initialize)(const char *configdir,
typedef int (*FPTR_VersionCheck)(const char *importedVersion);
typedef int (*FPTR_Initialize)(const char *configdir,
const char *certPrefix, const char *keyPrefix,
const char *secmodName, unsigned int flags);

Expand All @@ -42,6 +42,6 @@ typedef int __declspec(dllimport) (*FPTR_Initialize)(const char *configdir,
//char **SECMOD_GetModuleSpecList(SECMODModule *module);
//extern SECMODModuleList *SECMOD_GetDBModuleList(void);

typedef void __declspec(dllimport) *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse);
typedef char __declspec(dllimport) **(*FPTR_GetModuleSpecList)(void *module);
typedef void __declspec(dllimport) *(*FPTR_GetDBModuleList)(void);
typedef void *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse);
typedef char **(*FPTR_GetModuleSpecList)(void *module);
typedef void *(*FPTR_GetDBModuleList)(void);
2 changes: 1 addition & 1 deletion src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
#define CK_PTR *
#define CK_DEFINE_FUNCTION(returnType, name) returnType __declspec(dllexport) name
#define CK_DECLARE_FUNCTION(returnType, name) returnType __declspec(dllimport) name
#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType __declspec(dllimport) (* name)
#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name)
#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name)
#ifndef NULL_PTR
#define NULL_PTR 0
Expand Down