--- old/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h 2017-01-20 09:53:01.826288069 -0800 +++ /dev/null 2017-01-18 09:30:05.425422781 -0800 @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -// in nss.h: -// extern PRBool NSS_VersionCheck(const char *importedVersion); -// extern SECStatus NSS_Initialize(const char *configdir, -// const char *certPrefix, const char *keyPrefix, -// const char *secmodName, PRUint32 flags); - -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); - -// in secmod.h -//extern SECMODModule *SECMOD_LoadModule(char *moduleSpec,SECMODModule *parent, -// PRBool recurse); -//char **SECMOD_GetModuleSpecList(SECMODModule *module); -//extern SECMODModuleList *SECMOD_GetDBModuleList(void); - -typedef void *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse); -typedef char **(*FPTR_GetModuleSpecList)(void *module); -typedef void *(*FPTR_GetDBModuleList)(void); --- /dev/null 2017-01-18 09:30:05.425422781 -0800 +++ new/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h 2017-01-20 09:53:01.606288078 -0800 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// in nss.h: +// extern PRBool NSS_VersionCheck(const char *importedVersion); +// extern SECStatus NSS_Initialize(const char *configdir, +// const char *certPrefix, const char *keyPrefix, +// const char *secmodName, PRUint32 flags); + +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); + +// in secmod.h +//extern SECMODModule *SECMOD_LoadModule(char *moduleSpec,SECMODModule *parent, +// PRBool recurse); +//char **SECMOD_GetModuleSpecList(SECMODModule *module); +//extern SECMODModuleList *SECMOD_GetDBModuleList(void); + +typedef void *(*FPTR_LoadModule)(char *moduleSpec, void *parent, int recurse); +typedef char **(*FPTR_GetModuleSpecList)(void *module); +typedef void *(*FPTR_GetDBModuleList)(void);