Mercurial > illumos > illumos-gate
changeset 3899:6c4b3d85ee77
PSARC 2007/170 libelfsign/libike contract cancellation
6246343 elfsign should not depend on libike
| author | wyllys |
|---|---|
| date | Mon, 26 Mar 2007 19:04:02 -0700 |
| parents | c788126f2a20 |
| children | 0388bcf80faf |
| files | usr/src/Makefile usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com usr/src/uts/common/sys/crypto/elfsign.h |
| diffstat | 3 files changed, 11 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile Mon Mar 26 17:41:06 2007 -0700 +++ b/usr/src/Makefile Mon Mar 26 19:04:02 2007 -0700 @@ -251,7 +251,6 @@ @cd lib/pam_modules/krb5; pwd; $(MAKE) EXPORT_SRC @cd lib/udapl; pwd; $(MAKE) EXPORT_SRC @cd lib/libresolv2; pwd; $(MAKE) EXPORT_SRC - @cd $(CLOSED)/tools/elfsign; pwd; $(MAKE) EXPORT_SRC @cd uts/common/crypto/io; pwd; $(MAKE) EXPORT_SRC @cd uts/common/des; pwd; $(MAKE) EXPORT_SRC @cd uts/common/rpc; pwd; $(MAKE) EXPORT_SRC @@ -317,7 +316,6 @@ @cd lib/libresolv2; pwd; $(MAKE) CRYPT_SRC @cd lib/sasl_plugins; pwd; $(MAKE) CRYPT_SRC @cd lib/pam_modules/krb5; pwd; $(MAKE) CRYPT_SRC - @cd $(CLOSED)/tools/elfsign; pwd; $(MAKE) CRYPT_SRC @cd uts/common/gssapi; pwd; $(MAKE) CRYPT_SRC @cd uts/common/gssapi/include; pwd; $(MAKE) CRYPT_SRC @cd uts/common/gssapi/mechs/dummy; pwd; $(MAKE) CRYPT_SRC
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com Mon Mar 26 17:41:06 2007 -0700 +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com Mon Mar 26 19:04:02 2007 -0700 @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -32,15 +32,3 @@ include ../../Makefile.softtoken.com -PICLIBRARY = $(LIBRARY:%.a=%.pic.a) - -CLEANFILES += $(PICLIBRARY) - -all: $(PICLIBRARY) - -# -# Build archive library for libelfsign to link with staticly -# -$(PICLIBRARY): $(PICS) - $(RM) $@ - $(AR) -rc $@ $(PICS)
--- a/usr/src/uts/common/sys/crypto/elfsign.h Mon Mar 26 17:41:06 2007 -0700 +++ b/usr/src/uts/common/sys/crypto/elfsign.h Mon Mar 26 19:04:02 2007 -0700 @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -165,8 +165,8 @@ const uchar_t *sig, int sig_len, const char *oid, int oid_len); extern filesig_vers_t elfsign_extract_sig(ELFsign_t ess, struct filesignatures *fsp, uchar_t *sig, size_t *sig_len); -extern ELFsign_status_t elfsign_begin(const char *filename, - const char *certpath, enum ES_ACTION action, ELFsign_t *essp); +extern ELFsign_status_t elfsign_begin(const char *, + const char *, char *, enum ES_ACTION, ELFsign_t *); extern void elfsign_end(ELFsign_t ess); extern ELFsign_status_t elfsign_verify_signature(ELFsign_t ess, struct ELFsign_sig_info **esipp); @@ -198,20 +198,21 @@ typedef struct ELFCert_s *ELFCert_t; -extern boolean_t elfcertlib_init(void); +extern boolean_t elfcertlib_init(ELFsign_t, char *); -extern boolean_t elfcertlib_loadcert(ELFCert_t *certp, const char *pathname); -extern void elfcertlib_releasecert(ELFCert_t cert); +extern boolean_t elfcertlib_loadcert(ELFsign_t, ELFCert_t *, const char *); +extern void elfcertlib_releasecert(ELFsign_t, ELFCert_t); extern char *elfcertlib_getdn(ELFCert_t cert); extern char *elfcertlib_getissuer(ELFCert_t cert); extern boolean_t elfcertlib_loadprivatekey(ELFsign_t ess, ELFCert_t cert, - const char *path); + const char *path); extern boolean_t elfcertlib_loadtokenkey(ELFsign_t ess, ELFCert_t cert, - const char *token_id, const char *pin); + const char *token_id, const char *pin); extern boolean_t elfcertlib_sign(ELFsign_t ess, ELFCert_t cert, - const uchar_t *data, size_t data_len, uchar_t *sig, size_t *sig_len); + const uchar_t *data, size_t data_len, uchar_t *sig, + size_t *sig_len); #endif /* _KERNEL */