From 57f9146c45b1819afdd79a96a77ea55fb84ddb50 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:19:12 +0100 Subject: [PATCH] xmlsec1-customkeymanage.patch Conflicts: include/xmlsec/nss/app.h include/xmlsec/nss/keysstore.h src/nss/Makefile.in src/nss/hmac.c src/nss/keysstore.c src/nss/pkikeys.c src/nss/symkeys.c src/nss/x509.c src/nss/x509vfy.c --- include/xmlsec/nss/Makefile.am | 3 + include/xmlsec/nss/Makefile.in | 3 + include/xmlsec/nss/akmngr.h | 56 +++ include/xmlsec/nss/app.h | 5 + include/xmlsec/nss/ciphers.h | 35 ++ include/xmlsec/nss/keysstore.h | 4 + include/xmlsec/nss/tokens.h | 182 ++++++++++ src/nss/Makefile.am | 2 + src/nss/Makefile.in | 20 ++ src/nss/akmngr.c | 384 ++++++++++++++++++++ src/nss/hmac.c | 6 +- src/nss/keysstore.c | 772 +++++++++++++++++++++++++++++------------ src/nss/pkikeys.c | 81 ++--- src/nss/symkeys.c | 705 +++++++++++++++++++++++++++++++++++-- src/nss/tokens.c | 544 +++++++++++++++++++++++++++++ src/nss/x509.c | 491 ++++++-------------------- src/nss/x509vfy.c | 248 +++++-------- 17 files changed, 2703 insertions(+), 838 deletions(-) create mode 100644 include/xmlsec/nss/akmngr.h create mode 100644 include/xmlsec/nss/ciphers.h create mode 100644 include/xmlsec/nss/tokens.h create mode 100644 src/nss/akmngr.c create mode 100644 src/nss/tokens.c diff --git a/include/xmlsec/nss/Makefile.am b/include/xmlsec/nss/Makefile.am index e3521622..997ca7fd 100644 --- a/include/xmlsec/nss/Makefile.am +++ b/include/xmlsec/nss/Makefile.am @@ -10,6 +10,9 @@ bignum.h \ keysstore.h \ pkikeys.h \ x509.h \ +akmngr.h \ +tokens.h \ +ciphers.h \ $(NULL) install-exec-hook: diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/nss/Makefile.in index 6fecb4f5..672d10e7 100644 --- a/include/xmlsec/nss/Makefile.in +++ b/include/xmlsec/nss/Makefile.in @@ -407,6 +407,9 @@ bignum.h \ keysstore.h \ pkikeys.h \ x509.h \ +akmngr.h \ +tokens.h \ +ciphers.h \ $(NULL) all: all-am diff --git a/include/xmlsec/nss/akmngr.h b/include/xmlsec/nss/akmngr.h new file mode 100644 index 00000000..80535110 --- /dev/null +++ b/include/xmlsec/nss/akmngr.h @@ -0,0 +1,56 @@ +/** + * XMLSec library + * + * This is free software; see Copyright file in the source + * distribution for preciese wording. + * + * Copyright .......................... + */ +#ifndef __XMLSEC_NSS_AKMNGR_H__ +#define __XMLSEC_NSS_AKMNGR_H__ + +#include +#include +#include +#include + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +XMLSEC_CRYPTO_EXPORT xmlSecKeysMngrPtr +xmlSecNssAppliedKeysMngrCreate( + PK11SlotInfo** slots, + int cSlots, + CERTCertDBHandle* handler +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssAppliedKeysMngrSymKeyLoad( + xmlSecKeysMngrPtr mngr , + PK11SymKey* symKey +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssAppliedKeysMngrPubKeyLoad( + xmlSecKeysMngrPtr mngr , + SECKEYPublicKey* pubKey +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssAppliedKeysMngrPriKeyLoad( + xmlSecKeysMngrPtr mngr , + SECKEYPrivateKey* priKey +) ; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __XMLSEC_NSS_AKMNGR_H__ */ + + diff --git a/include/xmlsec/nss/app.h b/include/xmlsec/nss/app.h index 93f6c637..03f6aa14 100644 --- a/include/xmlsec/nss/app.h +++ b/include/xmlsec/nss/app.h @@ -22,6 +22,9 @@ extern "C" { #include #include +#include +#include + /******************************************************************** * * Init/shutdown @@ -40,6 +43,8 @@ XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrAdoptKey(xmlS xmlSecKeyPtr key); XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, const char* uri); +XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrAdoptKeySlot(xmlSecKeysMngrPtr mngr, + xmlSecNssKeySlotPtr keySlot); XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, const char* filename, xmlSecKeyDataType type); diff --git a/include/xmlsec/nss/ciphers.h b/include/xmlsec/nss/ciphers.h new file mode 100644 index 00000000..607eb1e0 --- /dev/null +++ b/include/xmlsec/nss/ciphers.h @@ -0,0 +1,35 @@ +/** + * XMLSec library + * + * This is free software; see Copyright file in the source + * distribution for preciese wording. + * + * Copyright .......................... + */ +#ifndef __XMLSEC_NSS_CIPHERS_H__ +#define __XMLSEC_NSS_CIPHERS_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include +#include +#include + + +XMLSEC_CRYPTO_EXPORT int xmlSecNssSymKeyDataAdoptKey( xmlSecKeyDataPtr data, + PK11SymKey* symkey ) ; + +XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt( PK11SymKey* symKey ) ; + +XMLSEC_CRYPTO_EXPORT PK11SymKey* xmlSecNssSymKeyDataGetKey(xmlSecKeyDataPtr data); + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __XMLSEC_NSS_CIPHERS_H__ */ + + diff --git a/include/xmlsec/nss/keysstore.h b/include/xmlsec/nss/keysstore.h index eb64d3c3..369a1453 100644 --- a/include/xmlsec/nss/keysstore.h +++ b/include/xmlsec/nss/keysstore.h @@ -16,6 +16,8 @@ extern "C" { #endif /* __cplusplus */ #include +#include +#include /**************************************************************************** * @@ -31,6 +33,8 @@ extern "C" { XMLSEC_CRYPTO_EXPORT xmlSecKeyStoreId xmlSecNssKeysStoreGetKlass (void); XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreAdoptKey (xmlSecKeyStorePtr store, xmlSecKeyPtr key); +XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreAdoptKeySlot(xmlSecKeyStorePtr store, + xmlSecNssKeySlotPtr keySlot); XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, const char *uri, xmlSecKeysMngrPtr keysMngr); diff --git a/include/xmlsec/nss/tokens.h b/include/xmlsec/nss/tokens.h new file mode 100644 index 00000000..444c5614 --- /dev/null +++ b/include/xmlsec/nss/tokens.h @@ -0,0 +1,182 @@ +/** + * XMLSec library + * + * This is free software; see Copyright file in the source + * distribution for preciese wording. + * + * Copyright (c) 2003 Sun Microsystems, Inc. All rights reserved. + * + * Contributor(s): _____________________________ + * + */ +#ifndef __XMLSEC_NSS_TOKENS_H__ +#define __XMLSEC_NSS_TOKENS_H__ + +#include + +#include +#include + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * xmlSecNssKeySlotListId + * + * The crypto mechanism list klass + */ +#define xmlSecNssKeySlotListId xmlSecNssKeySlotListGetKlass() +XMLSEC_CRYPTO_EXPORT xmlSecPtrListId xmlSecNssKeySlotListGetKlass( void ) ; + +/******************************************* + * KeySlot interfaces + *******************************************/ +/** + * Internal NSS key slot data + * @mechanismList: the mechanisms that the slot bound with. + * @slot: the pkcs slot + * + * This context is located after xmlSecPtrList + */ +typedef struct _xmlSecNssKeySlot xmlSecNssKeySlot ; +typedef struct _xmlSecNssKeySlot* xmlSecNssKeySlotPtr ; + +struct _xmlSecNssKeySlot { + CK_MECHANISM_TYPE_PTR mechanismList ; /* mech. array, NULL ternimated */ + PK11SlotInfo* slot ; +} ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotSetMechList( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE_PTR mechanismList +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotEnableMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE mechanism +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotDisableMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE mechanism +) ; + +XMLSEC_CRYPTO_EXPORT CK_MECHANISM_TYPE_PTR +xmlSecNssKeySlotGetMechList( + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotSetSlot( + xmlSecNssKeySlotPtr keySlot , + PK11SlotInfo* slot +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotInitialize( + xmlSecNssKeySlotPtr keySlot , + PK11SlotInfo* slot +) ; + +XMLSEC_CRYPTO_EXPORT void +xmlSecNssKeySlotFinalize( + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT PK11SlotInfo* +xmlSecNssKeySlotGetSlot( + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT xmlSecNssKeySlotPtr +xmlSecNssKeySlotCreate() ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotCopy( + xmlSecNssKeySlotPtr newKeySlot , + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT xmlSecNssKeySlotPtr +xmlSecNssKeySlotDuplicate( + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT void +xmlSecNssKeySlotDestroy( + xmlSecNssKeySlotPtr keySlot +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotBindMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE type +) ; + +XMLSEC_CRYPTO_EXPORT int +xmlSecNssKeySlotSupportMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE type +) ; + + +/************************************************************************ + * PKCS#11 crypto token interfaces + * + * A PKCS#11 slot repository will be defined internally. From the + * repository, a user can specify a particular slot for a certain crypto + * mechanism. + * + * In some situation, some cryptographic operation should act in a user + * designated devices. The interfaces defined here provide the way. If + * the user do not initialize the repository distinctly, the interfaces + * use the default functions provided by NSS itself. + * + ************************************************************************/ +/** + * Initialize NSS pkcs#11 slot repository + * + * Returns 0 if success or -1 if an error occurs. + */ +XMLSEC_CRYPTO_EXPORT int xmlSecNssSlotInitialize( void ) ; + +/** + * Shutdown and destroy NSS pkcs#11 slot repository + */ +XMLSEC_CRYPTO_EXPORT void xmlSecNssSlotShutdown() ; + +/** + * Get PKCS#11 slot handler + * @type the mechanism that the slot must support. + * + * Returns a pointer to PKCS#11 slot or NULL if an error occurs. + * + * Notes: The returned handler must be destroied distinctly. + */ +XMLSEC_CRYPTO_EXPORT PK11SlotInfo* xmlSecNssSlotGet( CK_MECHANISM_TYPE type ) ; + +/** + * Adopt a pkcs#11 slot with a mechanism into the repository + * @slot: the pkcs#11 slot. + * @mech: the mechanism. + * + * If @mech is available( @mech != CKM_INVALID_MECHANISM ), every operation with + * this mechanism only can perform on the @slot. + * + * Returns 0 if success or -1 if an error occurs. + */ +XMLSEC_CRYPTO_EXPORT int xmlSecNssSlotAdopt( PK11SlotInfo* slot, CK_MECHANISM_TYPE mech ) ; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __XMLSEC_NSS_TOKENS_H__ */ + diff --git a/src/nss/Makefile.am b/src/nss/Makefile.am index e666f33c..ec9e7896 100644 --- a/src/nss/Makefile.am +++ b/src/nss/Makefile.am @@ -35,6 +35,8 @@ libxmlsec1_nss_la_SOURCES =\ kw_des.c \ kw_aes.c \ globals.h \ + akmngr.c \ + tokens.c \ $(NULL) libxmlsec1_nss_la_LIBADD = \ diff --git a/src/nss/Makefile.in b/src/nss/Makefile.in index 2861e3ce..7532d90e 100644 --- a/src/nss/Makefile.in +++ b/src/nss/Makefile.in @@ -140,6 +140,8 @@ am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \ libxmlsec1_nss_la-x509.lo libxmlsec1_nss_la-x509vfy.lo \ libxmlsec1_nss_la-keysstore.lo libxmlsec1_nss_la-keytrans.lo \ libxmlsec1_nss_la-kw_des.lo libxmlsec1_nss_la-kw_aes.lo \ + libxmlsec1_nss_la-akmngr.lo \ + libxmlsec1_nss_la-tokens.lo \ $(am__objects_1) libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -474,6 +476,8 @@ libxmlsec1_nss_la_SOURCES = \ kw_des.c \ kw_aes.c \ globals.h \ + akmngr.c \ + tokens.c \ $(NULL) libxmlsec1_nss_la_LIBADD = \ @@ -584,6 +588,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-akmngr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-tokens.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -616,6 +622,20 @@ libxmlsec1_nss_la-app.lo: app.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c +libxmlsec1_nss_la-akmngr.lo: akmngr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-akmngr.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo $(DEPDIR)/libxmlsec1_nss_la-akmngr.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='akmngr.c' object='libxmlsec1_nss_la-akmngr.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c + +libxmlsec1_nss_la-tokens.lo: tokens.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-tokens.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_nss_la-tokens.Tpo -c -o libxmlsec1_nss_la-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxmlsec1_nss_la-tokens.Tpo $(DEPDIR)/libxmlsec1_nss_la-tokens.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tokens.c' object='libxmlsec1_nss_la-tokens.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c + libxmlsec1_nss_la-bignum.lo: bignum.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-bignum.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo $(DEPDIR)/libxmlsec1_nss_la-bignum.Plo diff --git a/src/nss/akmngr.c b/src/nss/akmngr.c new file mode 100644 index 00000000..65b94ac5 --- /dev/null +++ b/src/nss/akmngr.c @@ -0,0 +1,384 @@ +/** + * XMLSec library + * + * This is free software; see Copyright file in the source + * distribution for preciese wording. + * + * Copyright......................... + */ +#include "globals.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/** + * xmlSecNssAppliedKeysMngrCreate: + * @slot: array of pointers to NSS PKCS#11 slot information. + * @cSlots: number of slots in the array + * @handler: the pointer to NSS certificate database. + * + * Create and load NSS crypto slot and certificate database into keys manager + * + * Returns keys manager pointer on success or NULL otherwise. + */ +xmlSecKeysMngrPtr +xmlSecNssAppliedKeysMngrCreate( + PK11SlotInfo** slots, + int cSlots, + CERTCertDBHandle* handler +) { + xmlSecKeyDataStorePtr certStore = NULL ; + xmlSecKeysMngrPtr keyMngr = NULL ; + xmlSecKeyStorePtr keyStore = NULL ; + int islot = 0; + keyStore = xmlSecKeyStoreCreate( xmlSecNssKeysStoreId ) ; + if( keyStore == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeyStoreCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return NULL ; + } + + for (islot = 0; islot < cSlots; islot++) + { + xmlSecNssKeySlotPtr keySlot ; + + /* Create a key slot */ + keySlot = xmlSecNssKeySlotCreate() ; + if( keySlot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecNssKeySlotCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyStoreDestroy( keyStore ) ; + return NULL ; + } + + /* Set slot */ + if( xmlSecNssKeySlotSetSlot( keySlot , slots[islot] ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecNssKeySlotSetSlot" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyStoreDestroy( keyStore ) ; + xmlSecNssKeySlotDestroy( keySlot ) ; + return NULL ; + } + + /* Adopt keySlot */ + if( xmlSecNssKeysStoreAdoptKeySlot( keyStore , keySlot ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecNssKeysStoreAdoptKeySlot" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyStoreDestroy( keyStore ) ; + xmlSecNssKeySlotDestroy( keySlot ) ; + return NULL ; + } + } + + keyMngr = xmlSecKeysMngrCreate() ; + if( keyMngr == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeysMngrCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyStoreDestroy( keyStore ) ; + return NULL ; + } + + /*- + * Add key store to manager, from now on keys manager destroys the store if + * needed + */ + if( xmlSecKeysMngrAdoptKeysStore( keyMngr, keyStore ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecKeysMngrAdoptKeyStore" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyStoreDestroy( keyStore ) ; + xmlSecKeysMngrDestroy( keyMngr ) ; + return NULL ; + } + + /*- + * Initialize crypto library specific data in keys manager + */ + if( xmlSecNssKeysMngrInit( keyMngr ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeysMngrCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeysMngrDestroy( keyMngr ) ; + return NULL ; + } + + /*- + * Set certificate databse to X509 key data store + */ + /** + * Because Tej's implementation of certDB use the default DB, so I ignore + * the certDB handler at present. I'll modify the cert store sources to + * accept particular certDB instead of default ones. + certStore = xmlSecKeysMngrGetDataStore( keyMngr , xmlSecNssKeyDataStoreX509Id ) ; + if( certStore == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecKeysMngrGetDataStore" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeysMngrDestroy( keyMngr ) ; + return NULL ; + } + + if( xmlSecNssKeyDataStoreX509SetCertDb( certStore , handler ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , + "xmlSecNssKeyDataStoreX509SetCertDb" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeysMngrDestroy( keyMngr ) ; + return NULL ; + } + */ + + /*- + * Set the getKey callback + */ + keyMngr->getKey = xmlSecKeysMngrGetKey ; + + return keyMngr ; +} + +int +xmlSecNssAppliedKeysMngrSymKeyLoad( + xmlSecKeysMngrPtr mngr , + PK11SymKey* symKey +) { + xmlSecKeyPtr key ; + xmlSecKeyDataPtr data ; + xmlSecKeyStorePtr keyStore ; + + xmlSecAssert2( mngr != NULL , -1 ) ; + xmlSecAssert2( symKey != NULL , -1 ) ; + + keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ; + if( keyStore == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeysMngrGetKeysStore" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ; + + data = xmlSecNssSymKeyDataKeyAdopt( symKey ) ; + if( data == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + + key = xmlSecKeyCreate() ; + if( key == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecKeySetValue( key , data ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDestroy( key ) ; + return(-1) ; + } + + return(0) ; +} + +int +xmlSecNssAppliedKeysMngrPubKeyLoad( + xmlSecKeysMngrPtr mngr , + SECKEYPublicKey* pubKey +) { + xmlSecKeyPtr key ; + xmlSecKeyDataPtr data ; + xmlSecKeyStorePtr keyStore ; + + xmlSecAssert2( mngr != NULL , -1 ) ; + xmlSecAssert2( pubKey != NULL , -1 ) ; + + keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ; + if( keyStore == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeysMngrGetKeysStore" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ; + + data = xmlSecNssPKIAdoptKey( NULL, pubKey ) ; + if( data == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssPKIAdoptKey" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + + key = xmlSecKeyCreate() ; + if( key == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecKeySetValue( key , data ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDestroy( key ) ; + return(-1) ; + } + + return(0) ; +} + +int +xmlSecNssAppliedKeysMngrPriKeyLoad( + xmlSecKeysMngrPtr mngr , + SECKEYPrivateKey* priKey +) { + xmlSecKeyPtr key ; + xmlSecKeyDataPtr data ; + xmlSecKeyStorePtr keyStore ; + + xmlSecAssert2( mngr != NULL , -1 ) ; + xmlSecAssert2( priKey != NULL , -1 ) ; + + keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ; + if( keyStore == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeysMngrGetKeysStore" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ; + + data = xmlSecNssPKIAdoptKey( priKey, NULL ) ; + if( data == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssPKIAdoptKey" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + + key = xmlSecKeyCreate() ; + if( key == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecKeySetValue( key , data ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataKeyAdopt" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDestroy( key ) ; + return(-1) ; + } + + return(0) ; +} + diff --git a/src/nss/hmac.c b/src/nss/hmac.c index 558d4b93..2ef668c1 100644 --- a/src/nss/hmac.c +++ b/src/nss/hmac.c @@ -23,8 +23,8 @@ #include #include -#include #include +#include /* sizes in bits */ #define XMLSEC_NSS_MIN_HMAC_SIZE 80 @@ -355,9 +355,9 @@ xmlSecNssHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) { keyItem.data = xmlSecBufferGetData(buffer); keyItem.len = xmlSecBufferGetSize(buffer); - slot = PK11_GetBestSlot(ctx->digestType, NULL); + slot = xmlSecNssSlotGet(ctx->digestType); if(slot == NULL) { - xmlSecNssError("PK11_GetBestSlot", xmlSecTransformGetName(transform)); + xmlSecNssError("xmlSecNssSlotGet", xmlSecTransformGetName(transform)); return(-1); } diff --git a/src/nss/keysstore.c b/src/nss/keysstore.c index 0976e4a9..03baa887 100644 --- a/src/nss/keysstore.c +++ b/src/nss/keysstore.c @@ -1,36 +1,56 @@ /* * XML Security Library (http://www.aleksey.com/xmlsec). * - * Nss keys store that uses Simple Keys Store under the hood. Uses the - * Nss DB as a backing store for the finding keys, but the NSS DB is - * not written to by the keys store. - * So, if store->findkey is done and the key is not found in the simple - * keys store, the NSS DB is looked up. - * If store is called to adopt a key, that key is not written to the NSS - * DB. - * Thus, the NSS DB can be used to pre-load keys and becomes an alternate - * source of keys for xmlsec - * * This is free software; see Copyright file in the source * distribution for precise wording. * * Copyright (c) 2003 America Online, Inc. All rights reserved. */ + +/** + * NSS key store uses a key list and a slot list as the key repository. NSS slot + * list is a backup repository for the finding keys. If a key is not found from + * the key list, the NSS slot list is looked up. + * + * Any key in the key list will not save to pkcs11 slot. When a store to called + * to adopt a key, the key is resident in the key list; While a store to called + * to set a is resident in the key list; While a store to called to set a slot + * list, which means that the keys in the listed slot can be used for xml sign- + * nature or encryption. + * + * Then, a user can adjust slot list to effect the crypto behaviors of xmlSec. + * + * The framework will decrease the user interfaces to administrate xmlSec crypto + * engine. He can only focus on NSS layer functions. For examples, after the + * user set up a slot list handler to the keys store, he do not need to do any + * other work atop xmlSec interfaces, his action on the slot list handler, such + * as add a token to, delete a token from the list, will directly effect the key + * store behaviors. + * + * For example, a scenariio: + * 0. Create a slot list;( NSS interfaces ) + * 1. Create a keys store;( xmlSec interfaces ) + * 2. Set slot list with the keys store;( xmlSec Interfaces ) + * 3. Add a slot to the slot list;( NSS interfaces ) + * 4. Perform xml signature; ( xmlSec Interfaces ) + * 5. Deleter a slot from the slot list;( NSS interfaces ) + * 6. Perform xml encryption; ( xmlSec Interfaces ) + * 7. Perform xml signature;( xmlSec Interfaces ) + * 8. Destroy the keys store;( xmlSec Interfaces ) + * 8. Destroy the slot list.( NSS Interfaces ) + */ #include "globals.h" #include #include #include -#include #include +#include #include -#include - #include -#include -#include +#include #include #include @@ -38,82 +58,461 @@ #include #include -#include +#include +#include #include /**************************************************************************** * - * Nss Keys Store. Uses Simple Keys Store under the hood + * Internal NSS key store context * - * Simple Keys Store ptr is located after xmlSecKeyStore + * This context is located after xmlSecKeyStore * ***************************************************************************/ -#define xmlSecNssKeysStoreSize \ - (sizeof(xmlSecKeyStore) + sizeof(xmlSecKeyStorePtr)) +typedef struct _xmlSecNssKeysStoreCtx xmlSecNssKeysStoreCtx ; +typedef struct _xmlSecNssKeysStoreCtx* xmlSecNssKeysStoreCtxPtr ; -#define xmlSecNssKeysStoreGetSS(store) \ - ((xmlSecKeyStoreCheckSize((store), xmlSecNssKeysStoreSize)) ? \ - (xmlSecKeyStorePtr*)(((xmlSecByte*)(store)) + sizeof(xmlSecKeyStore)) : \ - (xmlSecKeyStorePtr*)NULL) +struct _xmlSecNssKeysStoreCtx { + xmlSecPtrListPtr keyList ; + xmlSecPtrListPtr slotList ; +} ; -static int xmlSecNssKeysStoreInitialize (xmlSecKeyStorePtr store); -static void xmlSecNssKeysStoreFinalize (xmlSecKeyStorePtr store); -static xmlSecKeyPtr xmlSecNssKeysStoreFindKey (xmlSecKeyStorePtr store, - const xmlChar* name, - xmlSecKeyInfoCtxPtr keyInfoCtx); - -static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = { - sizeof(xmlSecKeyStoreKlass), - xmlSecNssKeysStoreSize, - - /* data */ - BAD_CAST "NSS-keys-store", /* const xmlChar* name; */ +#define xmlSecNssKeysStoreSize \ + ( sizeof( xmlSecKeyStore ) + sizeof( xmlSecNssKeysStoreCtx ) ) + +#define xmlSecNssKeysStoreGetCtx( data ) \ + ( ( xmlSecNssKeysStoreCtxPtr )( ( ( xmlSecByte* )( data ) ) + sizeof( xmlSecKeyStore ) ) ) + +int xmlSecNssKeysStoreAdoptKeySlot( + xmlSecKeyStorePtr store , + xmlSecNssKeySlotPtr keySlot +) { + xmlSecNssKeysStoreCtxPtr context = NULL ; + + xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ; + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ; + context = xmlSecNssKeysStoreGetCtx( store ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecNssKeysStoreGetCtx" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + if( context->slotList == NULL ) { + if( ( context->slotList = xmlSecPtrListCreate( xmlSecNssKeySlotListId ) ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + } + + if( !xmlSecPtrListCheckId( context->slotList , xmlSecNssKeySlotListId ) ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListCheckId" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + if( xmlSecPtrListAdd( context->slotList , keySlot ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListAdd" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + return 0 ; +} - /* constructors/destructor */ - xmlSecNssKeysStoreInitialize, /* xmlSecKeyStoreInitializeMethod initialize; */ - xmlSecNssKeysStoreFinalize, /* xmlSecKeyStoreFinalizeMethod finalize; */ - xmlSecNssKeysStoreFindKey, /* xmlSecKeyStoreFindKeyMethod findKey; */ +int xmlSecNssKeysStoreAdoptKey( + xmlSecKeyStorePtr store , + xmlSecKeyPtr key +) { + xmlSecNssKeysStoreCtxPtr context = NULL ; + + xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ; + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ; + + context = xmlSecNssKeysStoreGetCtx( store ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecNssKeysStoreGetCtx" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + if( context->keyList == NULL ) { + if( ( context->keyList = xmlSecPtrListCreate( xmlSecKeyPtrListId ) ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + } + + if( !xmlSecPtrListCheckId( context->keyList , xmlSecKeyPtrListId ) ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListCheckId" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + if( xmlSecPtrListAdd( context->keyList , key ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecPtrListAdd" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + return 0 ; +} - /* reserved for the future */ - NULL, /* void* reserved0; */ - NULL, /* void* reserved1; */ -}; +/* + * xmlSecKeyStoreInitializeMethod: + * @store: the store. + * + * Keys store specific initialization method. + * + * Returns 0 on success or a negative value if an error occurs. + */ +static int +xmlSecNssKeysStoreInitialize( + xmlSecKeyStorePtr store +) { + xmlSecNssKeysStoreCtxPtr context = NULL ; + + xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ; + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ; + + context = xmlSecNssKeysStoreGetCtx( store ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecNssKeysStoreGetCtx" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + + context->keyList = NULL ; + context->slotList = NULL ; + + return 0 ; +} /** - * xmlSecNssKeysStoreGetKlass: * - * The Nss list based keys store klass. + * xmlSecKeyStoreFinalizeMethod: + * @store: the store. * - * Returns: Nss list based keys store klass. + * Keys store specific finalization (destroy) method. */ -xmlSecKeyStoreId -xmlSecNssKeysStoreGetKlass(void) { - return(&xmlSecNssKeysStoreKlass); +void +xmlSecNssKeysStoreFinalize( + xmlSecKeyStorePtr store +) { + xmlSecNssKeysStoreCtxPtr context = NULL ; + + xmlSecAssert( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) ) ; + xmlSecAssert( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) ) ; + + context = xmlSecNssKeysStoreGetCtx( store ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecNssKeysStoreGetCtx" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return ; + } + + if( context->keyList != NULL ) { + xmlSecPtrListDestroy( context->keyList ) ; + context->keyList = NULL ; + } + + if( context->slotList != NULL ) { + xmlSecPtrListDestroy( context->slotList ) ; + context->slotList = NULL ; + } } -/** - * xmlSecNssKeysStoreAdoptKey: - * @store: the pointer to Nss keys store. - * @key: the pointer to key. +xmlSecKeyPtr +xmlSecNssKeysStoreFindKeyFromSlot( + PK11SlotInfo* slot, + const xmlChar* name, + xmlSecKeyInfoCtxPtr keyInfoCtx +) { + xmlSecKeyPtr key = NULL ; + xmlSecKeyDataPtr data = NULL ; + int length ; + + xmlSecAssert2( slot != NULL , NULL ) ; + xmlSecAssert2( name != NULL , NULL ) ; + xmlSecAssert2( keyInfoCtx != NULL , NULL ) ; + + if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypeSymmetric ) == xmlSecKeyDataTypeSymmetric ) { + PK11SymKey* symKey ; + PK11SymKey* curKey ; + + /* Find symmetric key from the slot by name */ + symKey = PK11_ListFixedKeysInSlot( slot , ( char* )name , NULL ) ; + for( curKey = symKey ; curKey != NULL ; curKey = PK11_GetNextSymKey( curKey ) ) { + /* Check the key request */ + length = PK11_GetKeyLength( curKey ) ; + length *= 8 ; + if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) && + ( length > 0 ) && + ( length < keyInfoCtx->keyReq.keyBitsSize ) ) + continue ; + + /* We find a eligible key */ + data = xmlSecNssSymKeyDataKeyAdopt( curKey ) ; + if( data == NULL ) { + /* Do nothing */ + } + break ; + } + + /* Destroy the sym key list */ + for( curKey = symKey ; curKey != NULL ; ) { + symKey = curKey ; + curKey = PK11_GetNextSymKey( symKey ) ; + PK11_FreeSymKey( symKey ) ; + } + } else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) { + SECKEYPublicKeyList* pubKeyList ; + SECKEYPublicKey* pubKey ; + SECKEYPublicKeyListNode* curPub ; + + /* Find asymmetric key from the slot by name */ + pubKeyList = PK11_ListPublicKeysInSlot( slot , ( char* )name ) ; + pubKey = NULL ; + curPub = PUBKEY_LIST_HEAD(pubKeyList); + for( ; !PUBKEY_LIST_END(curPub, pubKeyList) ; curPub = PUBKEY_LIST_NEXT( curPub ) ) { + /* Check the key request */ + length = SECKEY_PublicKeyStrength( curPub->key ) ; + length *= 8 ; + if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) && + ( length > 0 ) && + ( length < keyInfoCtx->keyReq.keyBitsSize ) ) + continue ; + + /* We find a eligible key */ + pubKey = curPub->key ; + break ; + } + + if( pubKey != NULL ) { + data = xmlSecNssPKIAdoptKey( NULL, pubKey ) ; + if( data == NULL ) { + /* Do nothing */ + } + } + + /* Destroy the public key list */ + SECKEY_DestroyPublicKeyList( pubKeyList ) ; + } else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) { + SECKEYPrivateKeyList* priKeyList = NULL ; + SECKEYPrivateKey* priKey = NULL ; + SECKEYPrivateKeyListNode* curPri ; + + /* Find asymmetric key from the slot by name */ + priKeyList = PK11_ListPrivKeysInSlot( slot , ( char* )name , NULL ) ; + priKey = NULL ; + curPri = PRIVKEY_LIST_HEAD(priKeyList); + for( ; !PRIVKEY_LIST_END(curPri, priKeyList) ; curPri = PRIVKEY_LIST_NEXT( curPri ) ) { + /* Check the key request */ + length = PK11_SignatureLen( curPri->key ) ; + length *= 8 ; + if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) && + ( length > 0 ) && + ( length < keyInfoCtx->keyReq.keyBitsSize ) ) + continue ; + + /* We find a eligible key */ + priKey = curPri->key ; + break ; + } + + if( priKey != NULL ) { + data = xmlSecNssPKIAdoptKey( priKey, NULL ) ; + if( data == NULL ) { + /* Do nothing */ + } + } + + /* Destroy the private key list */ + SECKEY_DestroyPrivateKeyList( priKeyList ) ; + } + + /* If we have gotten the key value */ + if( data != NULL ) { + if( ( key = xmlSecKeyCreate() ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeyCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyDataDestroy( data ) ; + return NULL ; + } + + if( xmlSecKeySetValue( key , data ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeySetValue" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyDestroy( key ) ; + xmlSecKeyDataDestroy( data ) ; + return NULL ; + } + } + + return(key); +} + +/** + * xmlSecKeyStoreFindKeyMethod: + * @store: the store. + * @name: the desired key name. + * @keyInfoCtx: the pointer to key info context. * - * Adds @key to the @store. + * Keys store specific find method. The caller is responsible for destroying + * the returned key using #xmlSecKeyDestroy method. * - * Returns: 0 on success or a negative value if an error occurs. + * Returns the pointer to a key or NULL if key is not found or an error occurs. */ -int -xmlSecNssKeysStoreAdoptKey(xmlSecKeyStorePtr store, xmlSecKeyPtr key) { - xmlSecKeyStorePtr *ss; +static xmlSecKeyPtr +xmlSecNssKeysStoreFindKey( + xmlSecKeyStorePtr store , + const xmlChar* name , + xmlSecKeyInfoCtxPtr keyInfoCtx +) { + xmlSecNssKeysStoreCtxPtr context = NULL ; + xmlSecKeyPtr key = NULL ; + xmlSecNssKeySlotPtr keySlot = NULL ; + xmlSecSize pos ; + xmlSecSize size ; + + xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , NULL ) ; + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , NULL ) ; + xmlSecAssert2( keyInfoCtx != NULL , NULL ) ; + + context = xmlSecNssKeysStoreGetCtx( store ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecNssKeysStoreGetCtx" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return NULL ; + } - xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1); - xmlSecAssert2((key != NULL), -1); + /*- + * Look for key at keyList at first. + */ + if( context->keyList != NULL ) { + size = xmlSecPtrListGetSize( context->keyList ) ; + for( pos = 0 ; pos < size ; pos ++ ) { + key = ( xmlSecKeyPtr )xmlSecPtrListGetItem( context->keyList , pos ) ; + if( key != NULL && xmlSecKeyMatch( key , name , &( keyInfoCtx->keyReq ) ) ) { + return xmlSecKeyDuplicate( key ) ; + } + } + } + + /*- + * Find the key from slotList + */ + if( context->slotList != NULL ) { + PK11SlotInfo* slot = NULL ; + + size = xmlSecPtrListGetSize( context->slotList ) ; + for( pos = 0 ; pos < size ; pos ++ ) { + keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( context->slotList , pos ) ; + slot = xmlSecNssKeySlotGetSlot( keySlot ) ; + if( slot == NULL ) { + continue ; + } else { + key = xmlSecNssKeysStoreFindKeyFromSlot( slot, name, keyInfoCtx ) ; + if( key == NULL ) { + continue ; + } else { + return( key ) ; + } + } + } + } + + /*- + * Create a session key if we can not find the key from keyList and slotList + */ + if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypeSession ) == xmlSecKeyDataTypeSession ) { + key = xmlSecKeyGenerate( keyInfoCtx->keyReq.keyId , keyInfoCtx->keyReq.keyBitsSize , xmlSecKeyDataTypeSession ) ; + if( key == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) , + "xmlSecKeySetValue" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return NULL ; + } + + return key ; + } + + /** + * We have no way to find the key any more. + */ + return NULL ; +} - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert2(((ss != NULL) && (*ss != NULL) && - (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1); +static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = { + sizeof( xmlSecKeyStoreKlass ) , + xmlSecNssKeysStoreSize , + BAD_CAST "implicit_nss_keys_store" , + xmlSecNssKeysStoreInitialize , + xmlSecNssKeysStoreFinalize , + xmlSecNssKeysStoreFindKey , + NULL , + NULL +} ; - return (xmlSecSimpleKeysStoreAdoptKey(*ss, key)); +/** + * xmlSecNssKeysStoreGetKlass: + * + * The simple list based keys store klass. + * + */ +xmlSecKeyStoreId +xmlSecNssKeysStoreGetKlass( void ) { + return &xmlSecNssKeysStoreKlass ; } +/************************** + * Application routines + */ + /** * xmlSecNssKeysStoreLoad: * @store: the pointer to Nss keys store. @@ -227,191 +626,126 @@ xmlSecNssKeysStoreLoad(xmlSecKeyStorePtr store, const char *uri, */ int xmlSecNssKeysStoreSave(xmlSecKeyStorePtr store, const char *filename, xmlSecKeyDataType type) { - xmlSecKeyStorePtr *ss; + xmlSecKeyInfoCtx keyInfoCtx; + xmlSecNssKeysStoreCtxPtr context ; + xmlSecPtrListPtr list; + xmlSecKeyPtr key; + xmlSecSize i, keysSize; + xmlDocPtr doc; + xmlNodePtr cur; + xmlSecKeyDataPtr data; + xmlSecPtrListPtr idsList; + xmlSecKeyDataId dataId; + xmlSecSize idsSize, j; + int ret; xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1); - xmlSecAssert2((filename != NULL), -1); + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ), -1 ) ; + xmlSecAssert2(filename != NULL, -1); - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert2(((ss != NULL) && (*ss != NULL) && - (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1); + context = xmlSecNssKeysStoreGetCtx( store ) ; + xmlSecAssert2( context != NULL, -1 ); - return (xmlSecSimpleKeysStoreSave(*ss, filename, type)); -} - -static int -xmlSecNssKeysStoreInitialize(xmlSecKeyStorePtr store) { - xmlSecKeyStorePtr *ss; - - xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1); - - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert2(((ss == NULL) || (*ss == NULL)), -1); + list = context->keyList ; + xmlSecAssert2( list != NULL, -1 ); + xmlSecAssert2(xmlSecPtrListCheckId(list, xmlSecKeyPtrListId), -1); - *ss = xmlSecKeyStoreCreate(xmlSecSimpleKeysStoreId); - if(*ss == NULL) { + /* create doc */ + doc = xmlSecCreateTree(BAD_CAST "Keys", xmlSecNs); + if(doc == NULL) { xmlSecInternalError("xmlSecKeyStoreCreate(xmlSecSimpleKeysStoreId)", xmlSecKeyStoreGetName(store)); return(-1); } - return(0); -} - -static void -xmlSecNssKeysStoreFinalize(xmlSecKeyStorePtr store) { - xmlSecKeyStorePtr *ss; - - xmlSecAssert(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId)); - - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert((ss != NULL) && (*ss != NULL)); - - xmlSecKeyStoreDestroy(*ss); -} - -static xmlSecKeyPtr -xmlSecNssKeysStoreFindKey(xmlSecKeyStorePtr store, const xmlChar* name, - xmlSecKeyInfoCtxPtr keyInfoCtx) { - xmlSecKeyStorePtr* ss; - xmlSecKeyPtr key = NULL; - xmlSecKeyPtr retval = NULL; - xmlSecKeyReqPtr keyReq = NULL; - CERTCertificate *cert = NULL; - SECKEYPublicKey *pubkey = NULL; - SECKEYPrivateKey *privkey = NULL; - xmlSecKeyDataPtr data = NULL; - xmlSecKeyDataPtr x509Data = NULL; - int ret; - - xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), NULL); - xmlSecAssert2(keyInfoCtx != NULL, NULL); - - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert2(((ss != NULL) && (*ss != NULL)), NULL); - - key = xmlSecKeyStoreFindKey(*ss, name, keyInfoCtx); - if (key != NULL) { - return (key); - } - - /* Try to find the key in the NSS DB, and construct an xmlSecKey. - * we must have a name to lookup keys in NSS DB. - */ - if (name == NULL) { - goto done; - } + idsList = xmlSecKeyDataIdsGet(); + xmlSecAssert2(idsList != NULL, -1); - /* what type of key are we looking for? - * TBD: For now, we'll look only for public/private keys using the - * name as a cert nickname. Later on, we can attempt to find - * symmetric keys using PK11_FindFixedKey - */ - keyReq = &(keyInfoCtx->keyReq); - if (keyReq->keyType & - (xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate)) { - cert = CERT_FindCertByNickname (CERT_GetDefaultCertDB(), (char *)name); - if (cert == NULL) { - goto done; - } + keysSize = xmlSecPtrListGetSize(list); + idsSize = xmlSecPtrListGetSize(idsList); + for(i = 0; i < keysSize; ++i) { + key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i); + xmlSecAssert2(key != NULL, -1); - if (keyReq->keyType & xmlSecKeyDataTypePublic) { - pubkey = CERT_ExtractPublicKey(cert); - if (pubkey == NULL) { - xmlSecNssError("CERT_ExtractPublicKey", NULL); - goto done; - } + cur = xmlSecAddChild(xmlDocGetRootElement(doc), xmlSecNodeKeyInfo, xmlSecDSigNs); + if(cur == NULL) { + xmlSecInternalError("xmlSecAddChild", + xmlSecKeyStoreGetName(store)); + xmlFreeDoc(doc); + return(-1); } - if (keyReq->keyType & xmlSecKeyDataTypePrivate) { - privkey = PK11_FindKeyByAnyCert(cert, NULL); - if (privkey == NULL) { - xmlSecNssError("PK11_FindKeyByAnyCert", NULL); - goto done; + /* special data key name */ + if(xmlSecKeyGetName(key) != NULL) { + if(xmlSecAddChild(cur, xmlSecNodeKeyName, xmlSecDSigNs) == NULL) { + xmlSecInternalError("xmlSecAddChild", + xmlSecKeyStoreGetName(store)); + xmlFreeDoc(doc); + return(-1); } } - data = xmlSecNssPKIAdoptKey(privkey, pubkey); - if(data == NULL) { - xmlSecInternalError("xmlSecNssPKIAdoptKey", NULL); - goto done; - } - privkey = NULL; - pubkey = NULL; + /* create nodes for other keys data */ + for(j = 0; j < idsSize; ++j) { + dataId = (xmlSecKeyDataId)xmlSecPtrListGetItem(idsList, j); + xmlSecAssert2(dataId != xmlSecKeyDataIdUnknown, -1); - key = xmlSecKeyCreate(); - if (key == NULL) { - xmlSecInternalError("xmlSecKeyCreate", NULL); - return (NULL); - } + if(dataId->dataNodeName == NULL) { + continue; + } - x509Data = xmlSecKeyDataCreate(xmlSecNssKeyDataX509Id); - if(x509Data == NULL) { - xmlSecInternalError("xmlSecKeyDataCreate", - xmlSecTransformKlassGetName(xmlSecNssKeyDataX509Id)); - goto done; - } + data = xmlSecKeyGetData(key, dataId); + if(data == NULL) { + continue; + } - ret = xmlSecNssKeyDataX509AdoptKeyCert(x509Data, cert); - if (ret < 0) { - xmlSecInternalError("xmlSecNssKeyDataX509AdoptKeyCert", - xmlSecKeyDataGetName(x509Data)); - goto done; - } - cert = CERT_DupCertificate(cert); - if (cert == NULL) { - xmlSecNssError("CERT_DupCertificate", - xmlSecKeyDataGetName(x509Data)); - goto done; + if(xmlSecAddChild(cur, dataId->dataNodeName, dataId->dataNodeNs) == NULL) { + xmlSecInternalError("xmlSecAddChild", + xmlSecKeyStoreGetName(store)); + xmlFreeDoc(doc); + return(-1); + } } - ret = xmlSecNssKeyDataX509AdoptCert(x509Data, cert); + ret = xmlSecKeyInfoCtxInitialize(&keyInfoCtx, NULL); if (ret < 0) { - xmlSecInternalError("xmlSecNssKeyDataX509AdoptCert", - xmlSecKeyDataGetName(x509Data)); - goto done; + xmlSecInternalError("xmlSecKeyInfoCtxInitialize", + xmlSecKeyStoreGetName(store)); + xmlFreeDoc(doc); + return(-1); } - cert = NULL; - ret = xmlSecKeySetValue(key, data); - if (ret < 0) { - xmlSecInternalError("xmlSecKeySetValue", - xmlSecKeyDataGetName(data)); - goto done; - } - data = NULL; + keyInfoCtx.mode = xmlSecKeyInfoModeWrite; + keyInfoCtx.keyReq.keyId = xmlSecKeyDataIdUnknown; + keyInfoCtx.keyReq.keyType = type; + keyInfoCtx.keyReq.keyUsage = xmlSecKeyDataUsageAny; - ret = xmlSecKeyAdoptData(key, x509Data); + /* finally write key in the node */ + ret = xmlSecKeyInfoNodeWrite(cur, key, &keyInfoCtx); if (ret < 0) { - xmlSecInternalError("xmlSecKeyAdoptData", - xmlSecKeyDataGetName(x509Data)); - goto done; + xmlSecInternalError("xmlSecKeyInfoNodeWrite", + xmlSecKeyStoreGetName(store)); + xmlSecKeyInfoCtxFinalize(&keyInfoCtx); + xmlFreeDoc(doc); + return(-1); } - x509Data = NULL; - retval = key; - key = NULL; + xmlSecKeyInfoCtxFinalize(&keyInfoCtx); } -done: - if (cert != NULL) { - CERT_DestroyCertificate(cert); - } - if (pubkey != NULL) { - SECKEY_DestroyPublicKey(pubkey); - } - if (privkey != NULL) { - SECKEY_DestroyPrivateKey(privkey); - } - if (data != NULL) { - xmlSecKeyDataDestroy(data); - } - if (x509Data != NULL) { - xmlSecKeyDataDestroy(x509Data); - } - if (key != NULL) { - xmlSecKeyDestroy(key); + /* now write result */ + ret = xmlSaveFormatFile(filename, doc, 1); + if (ret < 0) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)), + "xmlSaveFormatFile", + XMLSEC_ERRORS_R_XML_FAILED, + "filename=%s", + xmlSecErrorsSafeString(filename)); + xmlFreeDoc(doc); + return(-1); } - return (retval); + xmlFreeDoc(doc); + return(0); } diff --git a/src/nss/pkikeys.c b/src/nss/pkikeys.c index 25828aec..0a15dae5 100644 --- a/src/nss/pkikeys.c +++ b/src/nss/pkikeys.c @@ -24,6 +24,7 @@ #include #include #include +#include /************************************************************************** * @@ -115,6 +116,8 @@ xmlSecNSSPKIKeyDataCtxDup(xmlSecNssPKIKeyDataCtxPtr ctxDst, xmlSecNssPKIKeyDataCtxPtr ctxSrc) { xmlSecNSSPKIKeyDataCtxFree(ctxDst); + ctxDst->privkey = NULL ; + ctxDst->pubkey = NULL ; if (ctxSrc->privkey != NULL) { ctxDst->privkey = SECKEY_CopyPrivateKey(ctxSrc->privkey); if(ctxDst->privkey == NULL) { @@ -563,9 +566,10 @@ xmlSecNssKeyDataDsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key, goto done; } - slot = PK11_GetBestSlot(CKM_DSA, NULL); + slot = xmlSecNssSlotGet(CKM_DSA); if(slot == NULL) { - xmlSecNssError("PK11_GetBestSlot", xmlSecKeyDataKlassGetName(id)); + xmlSecNssError("xmlSecNssSlotGet", + xmlSecKeyDataKlassGetName(id)); ret = -1; goto done; } @@ -713,14 +717,14 @@ done: if (slot != NULL) { PK11_FreeSlot(slot); } - if (ret != 0) { + if (pubkey != NULL) { SECKEY_DestroyPublicKey(pubkey); } if (data != NULL) { xmlSecKeyDataDestroy(data); } - } + return(ret); } @@ -739,7 +743,7 @@ xmlSecNssKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, ctx = xmlSecNssPKIKeyDataGetCtx(xmlSecKeyGetValue(key)); xmlSecAssert2(ctx != NULL, -1); - xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1); + /*xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/ if(((xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate) & keyInfoCtx->keyReq.keyType) == 0) { /* we can have only private key or public key */ @@ -826,36 +830,32 @@ xmlSecNssKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKe j = PQG_PBITS_TO_INDEX(sizeBits); rv = PK11_PQG_ParamGen(j, &pqgParams, &pqgVerify); if (rv != SECSuccess) { - xmlSecNssError2("PK11_PQG_ParamGen", xmlSecKeyDataGetName(data), + xmlSecNssError2("PK11_PQG_ParamGen", + xmlSecKeyDataGetName(data), "size=%lu", (unsigned long)sizeBits); + ret = -1; goto done; } rv = PK11_PQG_VerifyParams(pqgParams, pqgVerify, &res); if (rv != SECSuccess || res != SECSuccess) { - xmlSecNssError2("PK11_PQG_VerifyParams", xmlSecKeyDataGetName(data), - "size=%lu", (unsigned long)sizeBits); - goto done; - } - - slot = PK11_GetBestSlot(CKM_DSA_KEY_PAIR_GEN, NULL); - if(slot == NULL) { - xmlSecNssError("PK11_GetBestSlot", xmlSecKeyDataGetName(data)); - goto done; - } - - rv = PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */); - if (rv != SECSuccess) { - xmlSecNssError2("PK11_Authenticate", xmlSecKeyDataGetName(data), - "token=%s", xmlSecErrorsSafeString(PK11_GetTokenName(slot))); + xmlSecNssError2("PK11_PQG_VerifyParams", + xmlSecKeyDataGetName(data), + "size=%lu", (unsigned long)sizeBits); + ret = -1; goto done; } + slot = xmlSecNssSlotGet(CKM_DSA_KEY_PAIR_GEN); + PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */); privkey = PK11_GenerateKeyPair(slot, CKM_DSA_KEY_PAIR_GEN, pqgParams, &pubkey, PR_FALSE, PR_TRUE, NULL); if((privkey == NULL) || (pubkey == NULL)) { - xmlSecNssError("PK11_GenerateKeyPair", xmlSecKeyDataGetName(data)); + xmlSecNssError("PK11_GenerateKeyPair", + xmlSecKeyDataGetName(data)); + + ret = -1; goto done; } @@ -866,6 +866,8 @@ xmlSecNssKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKe goto done; } + privkey = NULL ; + pubkey = NULL ; ret = 0; done: @@ -878,16 +880,13 @@ done: if (pqgVerify != NULL) { PK11_PQG_DestroyVerify(pqgVerify); } - if (ret == 0) { - return (0); - } if (pubkey != NULL) { SECKEY_DestroyPublicKey(pubkey); } if (privkey != NULL) { SECKEY_DestroyPrivateKey(privkey); } - return(-1); + return(ret); } static xmlSecKeyDataType @@ -897,10 +896,10 @@ xmlSecNssKeyDataDsaGetType(xmlSecKeyDataPtr data) { xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDsaId), xmlSecKeyDataTypeUnknown); ctx = xmlSecNssPKIKeyDataGetCtx(data); xmlSecAssert2(ctx != NULL, -1); - xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1); + /*xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/ if (ctx->privkey != NULL) { return(xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic); - } else { + } else if( ctx->pubkey != NULL ) { return(xmlSecKeyDataTypePublic); } @@ -914,7 +913,7 @@ xmlSecNssKeyDataDsaGetSize(xmlSecKeyDataPtr data) { xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDsaId), 0); ctx = xmlSecNssPKIKeyDataGetCtx(data); xmlSecAssert2(ctx != NULL, -1); - xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1); + /*xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/ return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); } @@ -1101,9 +1100,10 @@ xmlSecNssKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key, goto done; } - slot = PK11_GetBestSlot(CKM_RSA_PKCS, NULL); + slot = xmlSecNssSlotGet(CKM_RSA_PKCS); if(slot == NULL) { - xmlSecNssError("PK11_GetBestSlot", xmlSecKeyDataKlassGetName(id)); + xmlSecNssError("PK11_GetBestSlot", + xmlSecKeyDataKlassGetName(id)); ret = -1; goto done; } @@ -1226,7 +1226,7 @@ xmlSecNssKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, ctx = xmlSecNssPKIKeyDataGetCtx(xmlSecKeyGetValue(key)); xmlSecAssert2(ctx != NULL, -1); - xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1); + /*xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);*/ if(((xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate) & keyInfoCtx->keyReq.keyType) == 0) { @@ -1282,19 +1282,8 @@ xmlSecNssKeyDataRsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKe params.keySizeInBits = sizeBits; params.pe = 65537; - slot = PK11_GetBestSlot(CKM_RSA_PKCS_KEY_PAIR_GEN, NULL); - if(slot == NULL) { - xmlSecNssError("PK11_GetBestSlot", xmlSecKeyDataGetName(data)); - goto done; - } - - rv = PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */); - if (rv != SECSuccess) { - xmlSecNssError2("PK11_Authenticate", xmlSecKeyDataGetName(data), - "token=%s", xmlSecErrorsSafeString(PK11_GetTokenName(slot))); - goto done; - } - + slot = xmlSecNssSlotGet(CKM_RSA_PKCS_KEY_PAIR_GEN); + PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */); privkey = PK11_GenerateKeyPair(slot, CKM_RSA_PKCS_KEY_PAIR_GEN, ¶ms, &pubkey, PR_FALSE, PR_TRUE, NULL); if(privkey == NULL || pubkey == NULL) { @@ -1354,7 +1343,7 @@ xmlSecNssKeyDataRsaGetSize(xmlSecKeyDataPtr data) { ctx = xmlSecNssPKIKeyDataGetCtx(data); xmlSecAssert2(ctx != NULL, -1); - xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1); + /*xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);*/ return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); } diff --git a/src/nss/symkeys.c b/src/nss/symkeys.c index c88be8b2..2807f934 100644 --- a/src/nss/symkeys.c +++ b/src/nss/symkeys.c @@ -14,20 +14,41 @@ #include #include +#include +#include + #include #include +#include #include #include #include #include #include +#include +#include /***************************************************************************** * - * Symmetic (binary) keys - just a wrapper for xmlSecKeyDataBinary + * Symmetic (binary) keys - a wrapper over slot information and PK11SymKey * ****************************************************************************/ +typedef struct _xmlSecNssSymKeyDataCtx xmlSecNssSymKeyDataCtx ; +typedef struct _xmlSecNssSymKeyDataCtx* xmlSecNssSymKeyDataCtxPtr ; + +struct _xmlSecNssSymKeyDataCtx { + CK_MECHANISM_TYPE cipher ; /* the symmetic key mechanism */ + PK11SlotInfo* slot ; /* the key resident slot */ + PK11SymKey* symkey ; /* the symmetic key */ +} ; + +#define xmlSecNssSymKeyDataSize \ + ( sizeof( xmlSecKeyData ) + sizeof( xmlSecNssSymKeyDataCtx ) ) + +#define xmlSecNssSymKeyDataGetCtx( data ) \ + ( ( xmlSecNssSymKeyDataCtxPtr )( ( ( xmlSecByte* )( data ) ) + sizeof( xmlSecKeyData ) ) ) + static int xmlSecNssSymKeyDataInitialize (xmlSecKeyDataPtr data); static int xmlSecNssSymKeyDataDuplicate (xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src); @@ -66,107 +87,743 @@ static int xmlSecNssSymKeyDataKlassCheck (xmlSecKeyDataKlass* klass); (xmlSecKeyDataIsValid((data)) && \ xmlSecNssSymKeyDataKlassCheck((data)->id)) +/** + * xmlSecNssSymKeyDataAdoptKey: + * @data: the pointer to symmetric key data. + * @symkey: the symmetric key + * + * Set the value of symmetric key data. + * + * Returns 0 on success or a negative value if an error occurs. + */ +int +xmlSecNssSymKeyDataAdoptKey( + xmlSecKeyDataPtr data , + PK11SymKey* symkey +) { + xmlSecNssSymKeyDataCtxPtr context = NULL ; + + xmlSecAssert2( xmlSecNssSymKeyDataCheckId( data ), -1 ) ; + xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), -1 ) ; + xmlSecAssert2( symkey != NULL, -1 ) ; + + context = xmlSecNssSymKeyDataGetCtx( data ) ; + xmlSecAssert2(context != NULL, -1); + + context->cipher = PK11_GetMechanism( symkey ) ; + + if( context->slot != NULL ) { + PK11_FreeSlot( context->slot ) ; + context->slot = NULL ; + } + context->slot = PK11_GetSlotFromKey( symkey ) ; + + if( context->symkey != NULL ) { + PK11_FreeSymKey( context->symkey ) ; + context->symkey = NULL ; + } + context->symkey = PK11_ReferenceSymKey( symkey ) ; + + return 0 ; +} + +xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt( + PK11SymKey* symKey +) { + xmlSecKeyDataPtr data = NULL ; + CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM ; + + xmlSecAssert2( symKey != NULL , NULL ) ; + + mechanism = PK11_GetMechanism( symKey ) ; + switch( mechanism ) { + case CKM_DES3_KEY_GEN : + case CKM_DES3_CBC : + case CKM_DES3_MAC : + data = xmlSecKeyDataCreate( xmlSecNssKeyDataDesId ) ; + if( data == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeyDataCreate" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + "xmlSecNssKeyDataDesId" ) ; + return NULL ; + } + break ; + case CKM_AES_KEY_GEN : + case CKM_AES_CBC : + case CKM_AES_MAC : + data = xmlSecKeyDataCreate( xmlSecNssKeyDataAesId ) ; + if( data == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecKeyDataCreate" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + "xmlSecNssKeyDataDesId" ) ; + return NULL ; + } + break ; + default : + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + "Unsupported mechanism" ) ; + return NULL ; + } + + if( xmlSecNssSymKeyDataAdoptKey( data , symKey ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + "xmlSecNssSymKeyDataAdoptKey" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecKeyDataDestroy( data ) ; + return NULL ; + } + + return data ; +} + + +PK11SymKey* +xmlSecNssSymKeyDataGetKey( + xmlSecKeyDataPtr data +) { + xmlSecNssSymKeyDataCtxPtr ctx; + PK11SymKey* symkey ; + + xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), NULL); + xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize), NULL); + + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert2(ctx != NULL, NULL); + + if( ctx->symkey != NULL ) { + symkey = PK11_ReferenceSymKey( ctx->symkey ) ; + } else { + symkey = NULL ; + } + + return(symkey); +} + static int xmlSecNssSymKeyDataInitialize(xmlSecKeyDataPtr data) { + xmlSecNssSymKeyDataCtxPtr ctx; + xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), -1); + xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize), -1); + + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert2(ctx != NULL, -1); + + memset( ctx, 0, sizeof(xmlSecNssSymKeyDataCtx)); + + /* Set the block cipher mechanism */ +#ifndef XMLSEC_NO_DES + if(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDesId)) { + ctx->cipher = CKM_DES3_KEY_GEN; + } else +#endif /* XMLSEC_NO_DES */ + +#ifndef XMLSEC_NO_AES + if(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDesId)) { + ctx->cipher = CKM_AES_KEY_GEN; + } else +#endif /* XMLSEC_NO_AES */ + + if(1) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)), + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + "Unsupported block cipher" ) ; + return(-1) ; + } - return(xmlSecKeyDataBinaryValueInitialize(data)); + return(0); } static int xmlSecNssSymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) { + xmlSecNssSymKeyDataCtxPtr ctxDst; + xmlSecNssSymKeyDataCtxPtr ctxSrc; + xmlSecAssert2(xmlSecNssSymKeyDataCheckId(dst), -1); + xmlSecAssert2(xmlSecKeyDataCheckSize(dst, xmlSecNssSymKeyDataSize), -1); xmlSecAssert2(xmlSecNssSymKeyDataCheckId(src), -1); + xmlSecAssert2(xmlSecKeyDataCheckSize(src, xmlSecNssSymKeyDataSize), -1); xmlSecAssert2(dst->id == src->id, -1); - return(xmlSecKeyDataBinaryValueDuplicate(dst, src)); + ctxDst = xmlSecNssSymKeyDataGetCtx(dst); + xmlSecAssert2(ctxDst != NULL, -1); + + ctxSrc = xmlSecNssSymKeyDataGetCtx(src); + xmlSecAssert2(ctxSrc != NULL, -1); + + ctxDst->cipher = ctxSrc->cipher ; + + if( ctxSrc->slot != NULL ) { + if( ctxDst->slot != NULL && ctxDst->slot != ctxSrc->slot ) { + PK11_FreeSlot( ctxDst->slot ) ; + ctxDst->slot = NULL ; + } + + if( ctxDst->slot == NULL && ctxSrc->slot != NULL ) + ctxDst->slot = PK11_ReferenceSlot( ctxSrc->slot ) ; + } else { + if( ctxDst->slot != NULL ) { + PK11_FreeSlot( ctxDst->slot ) ; + ctxDst->slot = NULL ; + } + } + + if( ctxSrc->symkey != NULL ) { + if( ctxDst->symkey != NULL && ctxDst->symkey != ctxSrc->symkey ) { + PK11_FreeSymKey( ctxDst->symkey ) ; + ctxDst->symkey = NULL ; + } + + if( ctxDst->symkey == NULL && ctxSrc->symkey != NULL ) + ctxDst->symkey = PK11_ReferenceSymKey( ctxSrc->symkey ) ; + } else { + if( ctxDst->symkey != NULL ) { + PK11_FreeSymKey( ctxDst->symkey ) ; + ctxDst->symkey = NULL ; + } + } + + return(0); } static void xmlSecNssSymKeyDataFinalize(xmlSecKeyDataPtr data) { + xmlSecNssSymKeyDataCtxPtr ctx; + xmlSecAssert(xmlSecNssSymKeyDataCheckId(data)); + xmlSecAssert(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize)); + + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert(ctx != NULL); - xmlSecKeyDataBinaryValueFinalize(data); + if( ctx->slot != NULL ) { + PK11_FreeSlot( ctx->slot ) ; + ctx->slot = NULL ; + } + + if( ctx->symkey != NULL ) { + PK11_FreeSymKey( ctx->symkey ) ; + ctx->symkey = NULL ; + } + + ctx->cipher = CKM_INVALID_MECHANISM ; } static int xmlSecNssSymKeyDataXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { - xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1); + PK11SymKey* symKey ; + PK11SlotInfo* slot ; + xmlSecBufferPtr keyBuf; + xmlSecSize len; + xmlSecKeyDataPtr data; + xmlSecNssSymKeyDataCtxPtr ctx; + SECItem keyItem ; + int ret; + + xmlSecAssert2(id != xmlSecKeyDataIdUnknown, -1); + xmlSecAssert2(key != NULL, -1); + xmlSecAssert2(node != NULL, -1); + xmlSecAssert2(keyInfoCtx != NULL, -1); + + /* Create a new KeyData from a id */ + data = xmlSecKeyDataCreate(id); + if(data == NULL ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyDataCreate", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + return(-1); + } - return(xmlSecKeyDataBinaryValueXmlRead(id, key, node, keyInfoCtx)); + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert2(ctx != NULL, -1); + + /* Create a buffer for raw symmetric key value */ + if( ( keyBuf = xmlSecBufferCreate( 128 ) ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecBufferCreate" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + /* Read the raw key value */ + if( xmlSecBufferBase64NodeContentRead( keyBuf , node ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + xmlSecErrorsSafeString(xmlSecNodeGetName(node)), + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecBufferDestroy( keyBuf ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + /* Get slot */ + slot = xmlSecNssSlotGet(ctx->cipher); + if( slot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecNssSlotGet" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + xmlSecBufferDestroy( keyBuf ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + /* Wrap the raw key value SECItem */ + keyItem.type = siBuffer ; + keyItem.data = xmlSecBufferGetData( keyBuf ) ; + keyItem.len = xmlSecBufferGetSize( keyBuf ) ; + + /* Import the raw key into slot temporalily and get the key handler*/ + symKey = PK11_ImportSymKey(slot, ctx->cipher, PK11_OriginGenerated, CKA_VALUE, &keyItem, NULL ) ; + if( symKey == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_ImportSymKey" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + PK11_FreeSlot( slot ) ; + xmlSecBufferDestroy( keyBuf ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + PK11_FreeSlot( slot ) ; + + /* raw key material has been copied into symKey, it isn't used any more */ + xmlSecBufferDestroy( keyBuf ) ; + + /* Adopt the symmetric key into key data */ + ret = xmlSecNssSymKeyDataAdoptKey(data, symKey); + if(ret < 0) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyDataBinaryValueSetBuffer", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1); + } + /* symKey has been duplicated into data, it isn't used any more */ + PK11_FreeSymKey( symKey ) ; + + /* Check value */ + if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), data) != 1) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyReqMatchKeyValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecKeyDataDestroy( data ) ; + return(0); + } + + ret = xmlSecKeySetValue(key, data); + if(ret < 0) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeySetValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecKeyDataDestroy( data ) ; + return(-1); + } + + return(0); } static int xmlSecNssSymKeyDataXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { + PK11SymKey* symKey ; + xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1); + xmlSecAssert2(key != NULL, -1); + xmlSecAssert2(node != NULL, -1); + xmlSecAssert2(keyInfoCtx != NULL, -1); + + /* Get symmetric key from "key" */ + symKey = xmlSecNssSymKeyDataGetKey(xmlSecKeyGetValue(key)); + if( symKey != NULL ) { + SECItem* keyItem ; + xmlSecBufferPtr keyBuf ; + + /* Extract raw key data from symmetric key */ + if( PK11_ExtractKeyValue( symKey ) != SECSuccess ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_ExtractKeyValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + /* Get raw key data from "symKey" */ + keyItem = PK11_GetKeyData( symKey ) ; + if(keyItem == NULL) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_GetKeyData", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + /* Create key data buffer with raw kwy material */ + keyBuf = xmlSecBufferCreate(keyItem->len) ; + if(keyBuf == NULL) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecBufferCreate", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + xmlSecBufferSetData( keyBuf , keyItem->data , keyItem->len ) ; + + /* Write raw key material into current xml node */ + if( xmlSecBufferBase64NodeContentWrite( keyBuf, node, XMLSEC_BASE64_LINESIZE ) < 0 ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecBufferBase64NodeContentWrite", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecBufferDestroy(keyBuf); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + xmlSecBufferDestroy(keyBuf); + PK11_FreeSymKey( symKey ) ; + } - return(xmlSecKeyDataBinaryValueXmlWrite(id, key, node, keyInfoCtx)); + return 0 ; } static int xmlSecNssSymKeyDataBinRead(xmlSecKeyDataId id, xmlSecKeyPtr key, const xmlSecByte* buf, xmlSecSize bufSize, xmlSecKeyInfoCtxPtr keyInfoCtx) { - xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1); + PK11SymKey* symKey ; + PK11SlotInfo* slot ; + xmlSecKeyDataPtr data; + xmlSecNssSymKeyDataCtxPtr ctx; + SECItem keyItem ; + int ret; + + xmlSecAssert2(id != xmlSecKeyDataIdUnknown, -1); + xmlSecAssert2(key != NULL, -1); + xmlSecAssert2(buf != NULL, -1); + xmlSecAssert2(bufSize != 0, -1); + xmlSecAssert2(keyInfoCtx != NULL, -1); + + /* Create a new KeyData from a id */ + data = xmlSecKeyDataCreate(id); + if(data == NULL ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyDataCreate", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + return(-1); + } + + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert2(ctx != NULL, -1); + + /* Get slot */ + slot = xmlSecNssSlotGet(ctx->cipher); + if( slot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecNssSlotGet" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } - return(xmlSecKeyDataBinaryValueBinRead(id, key, buf, bufSize, keyInfoCtx)); + /* Wrap the raw key value SECItem */ + keyItem.type = siBuffer ; + keyItem.data = buf ; + keyItem.len = bufSize ; + + /* Import the raw key into slot temporalily and get the key handler*/ + symKey = PK11_ImportSymKey(slot, ctx->cipher, PK11_OriginGenerated, CKA_VALUE, &keyItem, NULL ) ; + if( symKey == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_ImportSymKey" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + PK11_FreeSlot( slot ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1) ; + } + + /* Adopt the symmetric key into key data */ + ret = xmlSecNssSymKeyDataAdoptKey(data, symKey); + if(ret < 0) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyDataBinaryValueSetBuffer", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE ) ; + PK11_FreeSymKey( symKey ) ; + PK11_FreeSlot( slot ) ; + xmlSecKeyDataDestroy( data ) ; + return(-1); + } + /* symKey has been duplicated into data, it isn't used any more */ + PK11_FreeSymKey( symKey ) ; + PK11_FreeSlot( slot ) ; + + /* Check value */ + if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), data) != 1) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeyReqMatchKeyValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecKeyDataDestroy( data ) ; + return(0); + } + + ret = xmlSecKeySetValue(key, data); + if(ret < 0) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecKeySetValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecKeyDataDestroy( data ) ; + return(-1); + } + + return(0); } static int xmlSecNssSymKeyDataBinWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, xmlSecByte** buf, xmlSecSize* bufSize, xmlSecKeyInfoCtxPtr keyInfoCtx) { + PK11SymKey* symKey ; + xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1); + xmlSecAssert2(key != NULL, -1); + xmlSecAssert2(buf != NULL, -1); + xmlSecAssert2(bufSize != 0, -1); + xmlSecAssert2(keyInfoCtx != NULL, -1); + + /* Get symmetric key from "key" */ + symKey = xmlSecNssSymKeyDataGetKey(xmlSecKeyGetValue(key)); + if( symKey != NULL ) { + SECItem* keyItem ; + + /* Extract raw key data from symmetric key */ + if( PK11_ExtractKeyValue( symKey ) != SECSuccess ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_ExtractKeyValue", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + /* Get raw key data from "symKey" */ + keyItem = PK11_GetKeyData( symKey ) ; + if(keyItem == NULL) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "PK11_GetKeyData", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + *bufSize = keyItem->len; + *buf = ( xmlSecByte* )xmlMalloc( *bufSize ); + if( *buf == NULL ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + NULL, + XMLSEC_ERRORS_R_XMLSEC_FAILED, + XMLSEC_ERRORS_NO_MESSAGE); + PK11_FreeSymKey( symKey ) ; + return(-1); + } + + memcpy((*buf), keyItem->data, (*bufSize)); + PK11_FreeSymKey( symKey ) ; + } - return(xmlSecKeyDataBinaryValueBinWrite(id, key, buf, bufSize, keyInfoCtx)); + return 0 ; } static int xmlSecNssSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) { - xmlSecBufferPtr buffer; + PK11SymKey* symkey ; + PK11SlotInfo* slot ; + xmlSecNssSymKeyDataCtxPtr ctx; + int ret; xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), -1); xmlSecAssert2(sizeBits > 0, -1); - buffer = xmlSecKeyDataBinaryValueGetBuffer(data); - xmlSecAssert2(buffer != NULL, -1); + ctx = xmlSecNssSymKeyDataGetCtx(data); + xmlSecAssert2(ctx != NULL, -1); + + if( sizeBits % 8 != 0 ) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)), + NULL, + XMLSEC_ERRORS_R_XMLSEC_FAILED, + "Symmetric key size must be octuple"); + return(-1); + } + + /* Get slot */ + slot = xmlSecNssSlotGet(ctx->cipher); + if( slot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)), + "xmlSecNssSlotGet" , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1) ; + } + + if( PK11_Authenticate( slot, PR_FALSE , NULL ) != SECSuccess ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "PK11_Authenticate" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + PK11_FreeSlot( slot ) ; + return -1 ; + } + + symkey = PK11_KeyGen( slot , ctx->cipher , NULL , sizeBits/8 , NULL ) ; + if( symkey == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "PK11_KeyGen" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + PK11_FreeSlot( slot ) ; + return -1 ; + } - return(xmlSecNssGenerateRandom(buffer, (sizeBits + 7) / 8)); + if( ctx->slot != NULL ) { + PK11_FreeSlot( ctx->slot ) ; + ctx->slot = NULL ; + } + ctx->slot = slot ; + + if( ctx->symkey != NULL ) { + PK11_FreeSymKey( ctx->symkey ) ; + ctx->symkey = NULL ; + } + ctx->symkey = symkey ; + + return 0; } static xmlSecKeyDataType xmlSecNssSymKeyDataGetType(xmlSecKeyDataPtr data) { - xmlSecBufferPtr buffer; + xmlSecNssSymKeyDataCtxPtr context = NULL ; + xmlSecKeyDataType type = xmlSecKeyDataTypeUnknown ; xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), xmlSecKeyDataTypeUnknown); + xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), xmlSecKeyDataTypeUnknown ) ; + + context = xmlSecNssSymKeyDataGetCtx( data ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "xmlSecNssSymKeyDataGetCtx" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return xmlSecKeyDataTypeUnknown ; + } - buffer = xmlSecKeyDataBinaryValueGetBuffer(data); - xmlSecAssert2(buffer != NULL, xmlSecKeyDataTypeUnknown); + if( context->symkey != NULL ) { + type |= xmlSecKeyDataTypeSymmetric ; + } else { + type |= xmlSecKeyDataTypeUnknown ; + } - return((xmlSecBufferGetSize(buffer) > 0) ? xmlSecKeyDataTypeSymmetric : xmlSecKeyDataTypeUnknown); + return type ; } static xmlSecSize xmlSecNssSymKeyDataGetSize(xmlSecKeyDataPtr data) { + xmlSecNssSymKeyDataCtxPtr context ; + unsigned int length = 0 ; + xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), 0); + xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), 0 ) ; + context = xmlSecNssSymKeyDataGetCtx( data ) ; + if( context == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "xmlSecNssSymKeyDataGetCtx" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return 0 ; + } + + if( context->symkey != NULL ) { + length = PK11_GetKeyLength( context->symkey ) ; + length *= 8 ; + } - return(xmlSecKeyDataBinaryValueGetSize(data)); + return length ; } static void xmlSecNssSymKeyDataDebugDump(xmlSecKeyDataPtr data, FILE* output) { xmlSecAssert(xmlSecNssSymKeyDataCheckId(data)); - xmlSecKeyDataBinaryValueDebugDump(data, output); + /* print only size, everything else is sensitive */ + fprintf( output , "=== %s: size=%d\n" , data->id->dataNodeName , + xmlSecKeyDataGetSize(data)) ; } static void xmlSecNssSymKeyDataDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) { xmlSecAssert(xmlSecNssSymKeyDataCheckId(data)); - xmlSecKeyDataBinaryValueDebugXmlDump(data, output); + /* print only size, everything else is sensitive */ + fprintf( output , "<%s size=\"%d\" />\n" , data->id->dataNodeName , + xmlSecKeyDataGetSize(data)) ; } static int @@ -200,7 +857,7 @@ xmlSecNssSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) { *************************************************************************/ static xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = { sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, + xmlSecNssSymKeyDataSize, /* data */ xmlSecNameAESKeyValue, @@ -281,7 +938,7 @@ xmlSecNssKeyDataAesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize *************************************************************************/ static xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = { sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, + xmlSecNssSymKeyDataSize, /* data */ xmlSecNameDESKeyValue, @@ -363,7 +1020,7 @@ xmlSecNssKeyDataDesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize *************************************************************************/ static xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = { sizeof(xmlSecKeyDataKlass), - xmlSecKeyDataBinarySize, + xmlSecNssSymKeyDataSize, /* data */ xmlSecNameHMACKeyValue, diff --git a/src/nss/tokens.c b/src/nss/tokens.c new file mode 100644 index 00000000..40ad9bbe --- /dev/null +++ b/src/nss/tokens.c @@ -0,0 +1,544 @@ +/** + * XMLSec library + * + * This is free software; see Copyright file in the source + * distribution for preciese wording. + * + * Copyright.................................. + * + * Contributor(s): _____________________________ + * + */ + +/** + * In order to ensure that particular crypto operation is performed on + * particular crypto device, a subclass of xmlSecList is used to store slot and + * mechanism information. + * + * In the list, a slot is bound with a mechanism. If the mechanism is available, + * this mechanism only can perform on the slot; otherwise, it can perform on + * every eligibl slot in the list. + * + * When try to find a slot for a particular mechanism, the slot bound with + * avaliable mechanism will be looked up firstly. + */ +#include "globals.h" +#include + +#include +#include +#include + +#include + +int +xmlSecNssKeySlotSetMechList( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE_PTR mechanismList +) { + int counter ; + + xmlSecAssert2( keySlot != NULL , -1 ) ; + + if( keySlot->mechanismList != CK_NULL_PTR ) { + xmlFree( keySlot->mechanismList ) ; + + for( counter = 0 ; *( mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ; + keySlot->mechanismList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ; + if( keySlot->mechanismList == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( -1 ); + } + for( ; counter >= 0 ; counter -- ) + *( keySlot->mechanismList + counter ) = *( mechanismList + counter ) ; + } + + return( 0 ); +} + +int +xmlSecNssKeySlotEnableMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE mechanism +) { + int counter ; + CK_MECHANISM_TYPE_PTR newList ; + + xmlSecAssert2( keySlot != NULL , -1 ) ; + + if( mechanism != CKM_INVALID_MECHANISM ) { + for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ; + newList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ; + if( newList == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( -1 ); + } + *( newList + counter + 1 ) = CKM_INVALID_MECHANISM ; + *( newList + counter ) = mechanism ; + for( counter -= 1 ; counter >= 0 ; counter -- ) + *( newList + counter ) = *( keySlot->mechanismList + counter ) ; + + xmlFree( keySlot->mechanismList ) ; + keySlot->mechanismList = newList ; + } + + return(0); +} + +int +xmlSecNssKeySlotDisableMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE mechanism +) { + int counter ; + + xmlSecAssert2( keySlot != NULL , -1 ) ; + + for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) { + if( *( keySlot->mechanismList + counter ) == mechanism ) { + for( ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) { + *( keySlot->mechanismList + counter ) = *( keySlot->mechanismList + counter + 1 ) ; + } + + break ; + } + } + + return(0); +} + +CK_MECHANISM_TYPE_PTR +xmlSecNssKeySlotGetMechList( + xmlSecNssKeySlotPtr keySlot +) { + if( keySlot != NULL ) + return keySlot->mechanismList ; + else + return NULL ; +} + +int +xmlSecNssKeySlotSetSlot( + xmlSecNssKeySlotPtr keySlot , + PK11SlotInfo* slot +) { + xmlSecAssert2( keySlot != NULL , -1 ) ; + + if( slot != NULL && keySlot->slot != slot ) { + if( keySlot->slot != NULL ) + PK11_FreeSlot( keySlot->slot ) ; + + if( keySlot->mechanismList != NULL ) { + xmlFree( keySlot->mechanismList ) ; + keySlot->mechanismList = NULL ; + } + + keySlot->slot = PK11_ReferenceSlot( slot ) ; + } + + return(0); +} + +int +xmlSecNssKeySlotInitialize( + xmlSecNssKeySlotPtr keySlot , + PK11SlotInfo* slot +) { + xmlSecAssert2( keySlot != NULL , -1 ) ; + xmlSecAssert2( keySlot->slot == NULL , -1 ) ; + xmlSecAssert2( keySlot->mechanismList == NULL , -1 ) ; + + if( slot != NULL ) { + keySlot->slot = PK11_ReferenceSlot( slot ) ; + } + + return(0); +} + +void +xmlSecNssKeySlotFinalize( + xmlSecNssKeySlotPtr keySlot +) { + xmlSecAssert( keySlot != NULL ) ; + + if( keySlot->mechanismList != NULL ) { + xmlFree( keySlot->mechanismList ) ; + keySlot->mechanismList = NULL ; + } + + if( keySlot->slot != NULL ) { + PK11_FreeSlot( keySlot->slot ) ; + keySlot->slot = NULL ; + } + +} + +PK11SlotInfo* +xmlSecNssKeySlotGetSlot( + xmlSecNssKeySlotPtr keySlot +) { + if( keySlot != NULL ) + return keySlot->slot ; + else + return NULL ; +} + +xmlSecNssKeySlotPtr +xmlSecNssKeySlotCreate() { + xmlSecNssKeySlotPtr keySlot ; + + /* Allocates a new xmlSecNssKeySlot and fill the fields */ + keySlot = ( xmlSecNssKeySlotPtr )xmlMalloc( sizeof( xmlSecNssKeySlot ) ) ; + if( keySlot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( NULL ); + } + memset( keySlot, 0, sizeof( xmlSecNssKeySlot ) ) ; + + return( keySlot ) ; +} + +int +xmlSecNssKeySlotCopy( + xmlSecNssKeySlotPtr newKeySlot , + xmlSecNssKeySlotPtr keySlot +) { + CK_MECHANISM_TYPE_PTR mech ; + int counter ; + + xmlSecAssert2( newKeySlot != NULL , -1 ) ; + xmlSecAssert2( keySlot != NULL , -1 ) ; + + if( keySlot->slot != NULL && newKeySlot->slot != keySlot->slot ) { + if( newKeySlot->slot != NULL ) + PK11_FreeSlot( newKeySlot->slot ) ; + + newKeySlot->slot = PK11_ReferenceSlot( keySlot->slot ) ; + } + + if( keySlot->mechanismList != CK_NULL_PTR ) { + xmlFree( newKeySlot->mechanismList ) ; + + for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ; + newKeySlot->mechanismList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ; + if( newKeySlot->mechanismList == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( -1 ); + } + for( ; counter >= 0 ; counter -- ) + *( newKeySlot->mechanismList + counter ) = *( keySlot->mechanismList + counter ) ; + } + + return( 0 ); +} + +xmlSecNssKeySlotPtr +xmlSecNssKeySlotDuplicate( + xmlSecNssKeySlotPtr keySlot +) { + xmlSecNssKeySlotPtr newKeySlot ; + int ret ; + + xmlSecAssert2( keySlot != NULL , NULL ) ; + + newKeySlot = xmlSecNssKeySlotCreate() ; + if( newKeySlot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( NULL ); + } + + if( xmlSecNssKeySlotCopy( newKeySlot, keySlot ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( NULL ); + } + + return( newKeySlot ); +} + +void +xmlSecNssKeySlotDestroy( + xmlSecNssKeySlotPtr keySlot +) { + xmlSecAssert( keySlot != NULL ) ; + + if( keySlot->mechanismList != NULL ) + xmlFree( keySlot->mechanismList ) ; + + if( keySlot->slot != NULL ) + PK11_FreeSlot( keySlot->slot ) ; + + xmlFree( keySlot ) ; +} + +int +xmlSecNssKeySlotBindMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE type +) { + int counter ; + + xmlSecAssert2( keySlot != NULL , 0 ) ; + xmlSecAssert2( keySlot->slot != NULL , 0 ) ; + xmlSecAssert2( type != CKM_INVALID_MECHANISM , 0 ) ; + + for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) { + if( *( keySlot->mechanismList + counter ) == type ) + return(1) ; + } + + return( 0 ) ; +} + +int +xmlSecNssKeySlotSupportMech( + xmlSecNssKeySlotPtr keySlot , + CK_MECHANISM_TYPE type +) { + xmlSecAssert2( keySlot != NULL , 0 ) ; + xmlSecAssert2( keySlot->slot != NULL , 0 ) ; + xmlSecAssert2( type != CKM_INVALID_MECHANISM , 0 ) ; + + if( PK11_DoesMechanism( keySlot->slot , type ) == PR_TRUE ) { + return(1); + } else + return(0); +} + +void +xmlSecNssKeySlotDebugDump( + xmlSecNssKeySlotPtr keySlot , + FILE* output +) { + xmlSecAssert( keySlot != NULL ) ; + xmlSecAssert( output != NULL ) ; + + fprintf( output, "== KEY SLOT\n" ); +} + +void +xmlSecNssKeySlotDebugXmlDump( + xmlSecNssKeySlotPtr keySlot , + FILE* output +) { +} + +/** + * Key Slot List + */ +static xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = { + BAD_CAST "mechanism-list", + (xmlSecPtrDuplicateItemMethod)xmlSecNssKeySlotDuplicate, + (xmlSecPtrDestroyItemMethod)xmlSecNssKeySlotDestroy, + (xmlSecPtrDebugDumpItemMethod)xmlSecNssKeySlotDebugDump, + (xmlSecPtrDebugDumpItemMethod)xmlSecNssKeySlotDebugXmlDump, +}; + +xmlSecPtrListId +xmlSecNssKeySlotListGetKlass(void) { + return(&xmlSecNssKeySlotPtrListKlass); +} + + +/*- + * Global PKCS#11 crypto token repository -- Key slot list + */ +static xmlSecPtrListPtr _xmlSecNssKeySlotList = NULL ; + +PK11SlotInfo* +xmlSecNssSlotGet( + CK_MECHANISM_TYPE type +) { + PK11SlotInfo* slot = NULL ; + xmlSecNssKeySlotPtr keySlot ; + xmlSecSize ksSize ; + xmlSecSize ksPos ; + char flag ; + + if( _xmlSecNssKeySlotList == NULL ) { + slot = PK11_GetBestSlot( type , NULL ) ; + } else { + ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ; + + /*- + * Firstly, checking whether the mechanism is bound with a special slot. + * If no bound slot, we try to find the first eligible slot in the list. + */ + for( flag = 0, ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) { + keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ; + if( keySlot != NULL && xmlSecNssKeySlotBindMech( keySlot, type ) ) { + slot = xmlSecNssKeySlotGetSlot( keySlot ) ; + flag = 2 ; + } else if( flag == 0 && xmlSecNssKeySlotSupportMech( keySlot, type ) ) { + slot = xmlSecNssKeySlotGetSlot( keySlot ) ; + flag = 1 ; + } + + if( flag == 2 ) + break ; + } + if( slot != NULL ) + slot = PK11_ReferenceSlot( slot ) ; + } + + if( slot != NULL && PK11_NeedLogin( slot ) ) { + if( PK11_Authenticate( slot , PR_TRUE , NULL ) != SECSuccess ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + PK11_FreeSlot( slot ) ; + return( NULL ); + } + } + + return slot ; +} + +int +xmlSecNssSlotInitialize( + void +) { + if( _xmlSecNssKeySlotList != NULL ) { + xmlSecPtrListDestroy( _xmlSecNssKeySlotList ) ; + _xmlSecNssKeySlotList = NULL ; + } + + _xmlSecNssKeySlotList = xmlSecPtrListCreate( xmlSecNssKeySlotListId ) ; + if( _xmlSecNssKeySlotList == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return( -1 ); + } + + return(0); +} + +void +xmlSecNssSlotShutdown( + void +) { + if( _xmlSecNssKeySlotList != NULL ) { + xmlSecPtrListDestroy( _xmlSecNssKeySlotList ) ; + _xmlSecNssKeySlotList = NULL ; + } +} + +int +xmlSecNssSlotAdopt( + PK11SlotInfo* slot, + CK_MECHANISM_TYPE type +) { + xmlSecNssKeySlotPtr keySlot ; + xmlSecSize ksSize ; + xmlSecSize ksPos ; + char flag ; + + xmlSecAssert2( _xmlSecNssKeySlotList != NULL, -1 ) ; + xmlSecAssert2( slot != NULL, -1 ) ; + + ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ; + + /*- + * Firstly, checking whether the slot is in the repository already. + */ + flag = 0 ; + for( ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) { + keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ; + /* If find the slot in the list */ + if( keySlot != NULL && xmlSecNssKeySlotGetSlot( keySlot ) == slot ) { + /* If mechnism type is valid, bind the slot with the mechanism */ + if( type != CKM_INVALID_MECHANISM ) { + if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1); + } + } + + flag = 1 ; + } + } + + /* If the slot do not in the list, add a new item to the list */ + if( flag == 0 ) { + /* Create a new KeySlot */ + keySlot = xmlSecNssKeySlotCreate() ; + if( keySlot == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return(-1); + } + + /* Initialize the keySlot with a slot */ + if( xmlSecNssKeySlotInitialize( keySlot, slot ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecNssKeySlotDestroy( keySlot ) ; + return(-1); + } + + /* If mechnism type is valid, bind the slot with the mechanism */ + if( type != CKM_INVALID_MECHANISM ) { + if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecNssKeySlotDestroy( keySlot ) ; + return(-1); + } + } + + /* Add keySlot into the list */ + if( xmlSecPtrListAdd( _xmlSecNssKeySlotList, keySlot ) < 0 ) { + xmlSecError( XMLSEC_ERRORS_HERE , + NULL , + NULL , + XMLSEC_ERRORS_R_XMLSEC_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecNssKeySlotDestroy( keySlot ) ; + return(-1); + } + } + + return(0); +} + diff --git a/src/nss/x509.c b/src/nss/x509.c index 9c6c46f1..c95522d6 100644 --- a/src/nss/x509.c +++ b/src/nss/x509.c @@ -61,33 +61,18 @@ static int xmlSecNssX509DataNodeRead (xmlSecKeyDataPt static int xmlSecNssX509CertificateNodeRead (xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx); -static int xmlSecNssX509CertificateNodeWrite (CERTCertificate* cert, - xmlNodePtr node, - xmlSecKeyInfoCtxPtr keyInfoCtx); static int xmlSecNssX509SubjectNameNodeRead (xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx); -static int xmlSecNssX509SubjectNameNodeWrite (CERTCertificate* cert, - xmlNodePtr node, - xmlSecKeyInfoCtxPtr keyInfoCtx); static int xmlSecNssX509IssuerSerialNodeRead (xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx); -static int xmlSecNssX509IssuerSerialNodeWrite (CERTCertificate* cert, - xmlNodePtr node, - xmlSecKeyInfoCtxPtr keyInfoCtx); static int xmlSecNssX509SKINodeRead (xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx); -static int xmlSecNssX509SKINodeWrite (CERTCertificate* cert, - xmlNodePtr node, - xmlSecKeyInfoCtxPtr keyInfoCtx); static int xmlSecNssX509CRLNodeRead (xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx); -static int xmlSecNssX509CRLNodeWrite (CERTSignedCrl* crl, - xmlNodePtr node, - xmlSecKeyInfoCtxPtr keyInfoCtx); static int xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr key, xmlSecKeyInfoCtxPtr keyInfoCtx); @@ -104,9 +89,6 @@ static CERTSignedCrl* xmlSecNssX509CrlBase64DerRead (xmlChar* buf, xmlSecKeyInfoCtxPtr keyInfoCtx); static xmlChar* xmlSecNssX509CrlBase64DerWrite (CERTSignedCrl* crl, int base64LineWrap); -static xmlChar* xmlSecNssX509NameWrite (CERTName* nm); -static xmlChar* xmlSecNssASN1IntegerWrite (SECItem *num); -static xmlChar* xmlSecNssX509SKIWrite (CERTCertificate* cert); static void xmlSecNssX509CertDebugDump (CERTCertificate* cert, FILE* output); static void xmlSecNssX509CertDebugXmlDump (CERTCertificate* cert, @@ -700,29 +682,22 @@ static int xmlSecNssKeyDataX509XmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlSecKeyDataPtr data; + xmlNodePtr cur; + xmlChar* buf; CERTCertificate* cert; CERTSignedCrl* crl; xmlSecSize size, pos; - int content = 0; - int ret; xmlSecAssert2(id == xmlSecNssKeyDataX509Id, -1); xmlSecAssert2(key != NULL, -1); xmlSecAssert2(node != NULL, -1); xmlSecAssert2(keyInfoCtx != NULL, -1); - content = xmlSecX509DataGetNodeContent (node, keyInfoCtx); - if (content < 0) { - xmlSecInternalError2("xmlSecX509DataGetNodeContent", - xmlSecKeyDataKlassGetName(id), - "content=%d", content); - return(-1); - } else if(content == 0) { - /* by default we are writing certificates and crls */ - content = XMLSEC_X509DATA_DEFAULT; + /* todo: flag in ctx remove all existing content */ + if (0) { + xmlNodeSetContent(node, NULL); } - /* get x509 data */ data = xmlSecKeyGetData(key, id); if(data == NULL) { /* no x509 data in the key */ @@ -740,67 +715,65 @@ xmlSecNssKeyDataX509XmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, return(-1); } - if((content & XMLSEC_X509DATA_CERTIFICATE_NODE) != 0) { - ret = xmlSecNssX509CertificateNodeWrite(cert, node, keyInfoCtx); - if(ret < 0) { - xmlSecInternalError2("xmlSecNssX509CertificateNodeWrite", + /* set base64 lines size from context */ + buf = xmlSecNssX509CertBase64DerWrite(cert, keyInfoCtx->base64LineSize); + if(buf == NULL) { + xmlSecInternalError2("xmlSecNssX509CertBase64DerWrite", xmlSecKeyDataKlassGetName(id), "pos=%d", pos); return(-1); - } } - if((content & XMLSEC_X509DATA_SUBJECTNAME_NODE) != 0) { - ret = xmlSecNssX509SubjectNameNodeWrite(cert, node, keyInfoCtx); - if(ret < 0) { - xmlSecInternalError2("xmlSecNssX509SubjectNameNodeWrite", + cur = xmlSecAddChild(node, xmlSecNodeX509Certificate, xmlSecDSigNs); + if(cur == NULL) { + xmlSecInternalError2("xmlSecAddChild", xmlSecKeyDataKlassGetName(id), "pos=%d", pos); + xmlFree(buf); return(-1); - } } + /* todo: add \n around base64 data - from context */ + /* todo: add errors check */ + xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed()); + xmlNodeSetContent(cur, buf); + xmlFree(buf); + } - if((content & XMLSEC_X509DATA_ISSUERSERIAL_NODE) != 0) { - ret = xmlSecNssX509IssuerSerialNodeWrite(cert, node, keyInfoCtx); - if(ret < 0) { - xmlSecInternalError2("xmlSecNssX509IssuerSerialNodeWrite", - xmlSecKeyDataKlassGetName(id), - "pos=%d", pos); - return(-1); - } + /* write crls */ + size = xmlSecNssKeyDataX509GetCrlsSize(data); + for(pos = 0; pos < size; ++pos) { + crl = xmlSecNssKeyDataX509GetCrl(data, pos); + if(crl == NULL) { + xmlSecInternalError2("xmlSecNssKeyDataX509GetCrl", + xmlSecKeyDataKlassGetName(id), + "pos=%d", pos); + return(-1); } - if((content & XMLSEC_X509DATA_SKI_NODE) != 0) { - ret = xmlSecNssX509SKINodeWrite(cert, node, keyInfoCtx); - if(ret < 0) { - xmlSecInternalError2("xmlSecNssX509SKINodeWrite", - xmlSecKeyDataKlassGetName(id), - "pos=%d", pos); - return(-1); - } + /* set base64 lines size from context */ + buf = xmlSecNssX509CrlBase64DerWrite(crl, keyInfoCtx->base64LineSize); + if(buf == NULL) { + xmlSecInternalError2("xmlSecNssX509CrlBase64DerWrite", + xmlSecKeyDataKlassGetName(id), + "pos=%d", pos); + return(-1); } - } - - /* write crls if needed */ - if((content & XMLSEC_X509DATA_CRL_NODE) != 0) { - size = xmlSecNssKeyDataX509GetCrlsSize(data); - for(pos = 0; pos < size; ++pos) { - crl = xmlSecNssKeyDataX509GetCrl(data, pos); - if(crl == NULL) { - xmlSecInternalError2("xmlSecNssKeyDataX509GetCrl", - xmlSecKeyDataKlassGetName(id), - "pos=%d", pos); - return(-1); - } - ret = xmlSecNssX509CRLNodeWrite(crl, node, keyInfoCtx); - if(ret < 0) { - xmlSecInternalError2("xmlSecNssX509CRLNodeWrite", - xmlSecKeyDataKlassGetName(id), - "pos=%d", pos); - return(-1); - } + cur = xmlSecAddChild(node, xmlSecNodeX509CRL, xmlSecDSigNs); + if(cur == NULL) { + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)), + "xmlSecAddChild", + XMLSEC_ERRORS_R_XMLSEC_FAILED, + "new_node=%s", + xmlSecErrorsSafeString(xmlSecNodeX509CRL)); + xmlFree(buf); + return(-1); } + /* todo: add \n around base64 data - from context */ + /* todo: add errors check */ + xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed()); + xmlNodeSetContent(cur, buf); } return(0); @@ -988,37 +961,6 @@ xmlSecNssX509CertificateNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecK } static int -xmlSecNssX509CertificateNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { - xmlChar* buf; - xmlNodePtr cur; - - xmlSecAssert2(cert != NULL, -1); - xmlSecAssert2(node != NULL, -1); - xmlSecAssert2(keyInfoCtx != NULL, -1); - - /* set base64 lines size from context */ - buf = xmlSecNssX509CertBase64DerWrite(cert, keyInfoCtx->base64LineSize); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssX509CertBase64DerWrite", NULL); - return(-1); - } - - cur = xmlSecEnsureEmptyChild(node, xmlSecNodeX509Certificate, xmlSecDSigNs); - if(cur == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509Certificate)", NULL); - xmlFree(buf); - return(-1); - } - - /* todo: add \n around base64 data - from context */ - /* todo: add errors check */ - xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed()); - xmlNodeSetContent(cur, buf); - xmlFree(buf); - return(0); -} - -static int xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlSecKeyDataStorePtr x509Store; xmlChar* subject; @@ -1038,15 +980,11 @@ xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecK } subject = xmlNodeGetContent(node); - if((subject == NULL) || (xmlSecIsEmptyString(subject) == 1)) { - if(subject != NULL) { - xmlFree(subject); - } - if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) { - xmlSecInvalidNodeContentError(node, xmlSecKeyDataGetName(data), "empty"); + if(subject == NULL) { + xmlSecInvalidNodeContentError(node, + xmlSecKeyDataGetName(data), + "empty"); return(-1); - } - return(0); } cert = xmlSecNssX509StoreFindCert(x509Store, subject, NULL, NULL, NULL, keyInfoCtx); @@ -1077,40 +1015,6 @@ xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecK } static int -xmlSecNssX509SubjectNameNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) { - xmlChar* buf = NULL; - xmlNodePtr cur = NULL; - int ret; - - xmlSecAssert2(cert != NULL, -1); - xmlSecAssert2(node != NULL, -1); - - buf = xmlSecNssX509NameWrite(&(cert->subject)); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssX509NameWrite(&(cert->subject))", NULL); - return(-1); - } - - cur = xmlSecEnsureEmptyChild(node, xmlSecNodeX509SubjectName, xmlSecDSigNs); - if(cur == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509SubjectName)", NULL); - xmlFree(buf); - return(-1); - } - - ret = xmlSecNodeEncodeAndSetContent(cur, buf); - if(ret < 0) { - xmlSecInternalError("xmlSecNodeEncodeAndSetContent", NULL); - xmlFree(buf); - return(-1); - } - - /* done */ - xmlFree(buf); - return(0); -} - -static int xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlSecKeyDataStorePtr x509Store; xmlNodePtr cur; @@ -1132,18 +1036,11 @@ xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSec } cur = xmlSecGetNextElementNode(node->children); - if(cur == NULL) { - if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) { - xmlSecNodeNotFoundError("xmlSecGetNextElementNode", node, NULL, - xmlSecKeyDataGetName(data)); - return(-1); - } - return(0); - } /* the first is required node X509IssuerName */ - if(!xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs)) { - xmlSecInvalidNodeError(cur, xmlSecNodeX509IssuerName, xmlSecKeyDataGetName(data)); + if((cur == NULL) || !xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs)) { + xmlSecNodeNotFoundError("xmlSecGetNextElementNode", node, NULL, + xmlSecKeyDataGetName(data)); return(-1); } issuerName = xmlNodeGetContent(cur); @@ -1207,62 +1104,6 @@ xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSec } static int -xmlSecNssX509IssuerSerialNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) { - xmlNodePtr cur; - xmlNodePtr issuerNameNode; - xmlNodePtr issuerNumberNode; - xmlChar* buf; - int ret; - - xmlSecAssert2(cert != NULL, -1); - xmlSecAssert2(node != NULL, -1); - - /* create xml nodes */ - cur = xmlSecEnsureEmptyChild(node, xmlSecNodeX509IssuerSerial, xmlSecDSigNs); - if(cur == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509IssuerSerial)", NULL); - return(-1); - } - - issuerNameNode = xmlSecEnsureEmptyChild(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs); - if(issuerNameNode == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509IssuerName)", NULL); - return(-1); - } - - issuerNumberNode = xmlSecEnsureEmptyChild(cur, xmlSecNodeX509SerialNumber, xmlSecDSigNs); - if(issuerNumberNode == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509SerialNumber)", NULL); - return(-1); - } - - /* write data */ - buf = xmlSecNssX509NameWrite(&(cert->issuer)); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssX509NameWrite(&(cert->issuer))", NULL); - return(-1); - } - - ret = xmlSecNodeEncodeAndSetContent(issuerNameNode, buf); - if(ret < 0) { - xmlSecInternalError("xmlSecNodeEncodeAndSetContent(issuerNameNode)", NULL); - xmlFree(buf); - return(-1); - } - xmlFree(buf); - - buf = xmlSecNssASN1IntegerWrite(&(cert->serialNumber)); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssASN1IntegerWrite(&(cert->serialNumber))", NULL); - return(-1); - } - xmlNodeSetContent(issuerNumberNode, buf); - xmlFree(buf); - - return(0); -} - -static int xmlSecNssX509SKINodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlSecKeyDataStorePtr x509Store; xmlChar* ski; @@ -1282,15 +1123,9 @@ xmlSecNssX509SKINodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCt } ski = xmlNodeGetContent(node); - if((ski == NULL) || (xmlSecIsEmptyString(ski) == 1)) { - if(ski != NULL) { - xmlFree(ski); - } - if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) { + if(ski == NULL) { xmlSecInvalidNodeContentError(node, xmlSecKeyDataGetName(data), "empty"); return(-1); - } - return(0); } cert = xmlSecNssX509StoreFindCert(x509Store, NULL, NULL, NULL, ski, keyInfoCtx); @@ -1319,40 +1154,6 @@ xmlSecNssX509SKINodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCt } static int -xmlSecNssX509SKINodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) { - xmlChar *buf = NULL; - xmlNodePtr cur = NULL; - int ret; - - xmlSecAssert2(cert != NULL, -1); - xmlSecAssert2(node != NULL, -1); - - buf = xmlSecNssX509SKIWrite(cert); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssX509SKIWrite", NULL); - return(-1); - } - - cur = xmlSecEnsureEmptyChild(node, xmlSecNodeX509SKI, xmlSecDSigNs); - if(cur == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509SKI)", NULL); - xmlFree(buf); - return(-1); - } - - ret = xmlSecNodeEncodeAndSetContent(cur, buf); - if(ret < 0) { - xmlSecInternalError("xmlSecNodeEncodeAndSetContent", NULL); - xmlFree(buf); - return(-1); - } - - /* done */ - xmlFree(buf); - return(0); -} - -static int xmlSecNssX509CRLNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlChar *content; CERTSignedCrl* crl; @@ -1362,15 +1163,9 @@ xmlSecNssX509CRLNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCt xmlSecAssert2(keyInfoCtx != NULL, -1); content = xmlNodeGetContent(node); - if((content == NULL) || (xmlSecIsEmptyString(content) == 1)) { - if(content != NULL) { - xmlFree(content); - } - if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) { + if(content == NULL){ xmlSecInvalidNodeContentError(node, xmlSecKeyDataGetName(data), "empty"); return(-1); - } - return(0); } crl = xmlSecNssX509CrlBase64DerRead(content, keyInfoCtx); @@ -1387,38 +1182,6 @@ xmlSecNssX509CRLNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCt } static int -xmlSecNssX509CRLNodeWrite(CERTSignedCrl* crl, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) { - xmlChar* buf = NULL; - xmlNodePtr cur = NULL; - - xmlSecAssert2(crl != NULL, -1); - xmlSecAssert2(node != NULL, -1); - xmlSecAssert2(keyInfoCtx != NULL, -1); - - /* set base64 lines size from context */ - buf = xmlSecNssX509CrlBase64DerWrite(crl, keyInfoCtx->base64LineSize); - if(buf == NULL) { - xmlSecInternalError("xmlSecNssX509CrlBase64DerWrite", NULL); - return(-1); - } - - cur = xmlSecEnsureEmptyChild(node, xmlSecNodeX509CRL, xmlSecDSigNs); - if(cur == NULL) { - xmlSecInternalError("xmlSecEnsureEmptyChild(NodeX509CRL)", NULL); - xmlFree(buf); - return(-1); - } - /* todo: add \n around base64 data - from context */ - /* todo: add errors check */ - xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed()); - xmlNodeSetContent(cur, buf); - xmlFree(buf); - - return(0); -} - - -static int xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr key, xmlSecKeyInfoCtxPtr keyInfoCtx) { xmlSecNssX509DataCtxPtr ctx; @@ -1427,6 +1190,10 @@ xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr key, SECStatus status; PRTime notBefore, notAfter; + PK11SlotInfo* slot ; + SECKEYPublicKey *pubKey = NULL; + SECKEYPrivateKey *priKey = NULL; + xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataX509Id), -1); xmlSecAssert2(key != NULL, -1); xmlSecAssert2(keyInfoCtx != NULL, -1); @@ -1456,12 +1223,64 @@ xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr key, return(-1); } + /*- + * Get Public key from cert, which does not always work for sign + * action. + * keyValue = xmlSecNssX509CertGetKey(ctx->keyCert); if(keyValue == NULL) { xmlSecInternalError("xmlSecNssX509CertGetKey", xmlSecKeyDataGetName(data)); return(-1); } + */ + /*- + * I'll search key according to KeyReq. + */ + slot = cert->slot ; + if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) { + if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "PK11_FindPrivateKeyFromCert" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } + } + + if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) { + if( ( pubKey = CERT_ExtractPublicKey( cert ) ) == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "CERT_ExtractPublicKey" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + + if( priKey != NULL ) + SECKEY_DestroyPrivateKey( priKey ) ; + return -1 ; + } + } + + keyValue = xmlSecNssPKIAdoptKey(priKey, pubKey); + if( keyValue == NULL ) { + xmlSecError( XMLSEC_ERRORS_HERE , + xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) , + "xmlSecNssPKIAdoptKey" , + XMLSEC_ERRORS_R_CRYPTO_FAILED , + XMLSEC_ERRORS_NO_MESSAGE ) ; + + if( priKey != NULL ) + SECKEY_DestroyPrivateKey( priKey ) ; + + if( pubKey != NULL ) + SECKEY_DestroyPublicKey( pubKey ) ; + + return -1 ; + } + /* Modify keyValue get Done */ /* verify that the key matches our expectations */ if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), keyValue) != 1) { @@ -1702,88 +1521,6 @@ xmlSecNssX509CrlBase64DerWrite(CERTSignedCrl* crl, int base64LineWrap) { return(res); } -static xmlChar* -xmlSecNssX509NameWrite(CERTName* nm) { - xmlChar *res = NULL; - char *str; - - xmlSecAssert2(nm != NULL, NULL); - - str = CERT_NameToAscii(nm); - if (str == NULL) { - xmlSecNssError("CERT_NameToAscii", NULL); - return(NULL); - } - - res = xmlStrdup(BAD_CAST str); - if(res == NULL) { - xmlSecStrdupError(BAD_CAST str, NULL); - PORT_Free(str); - return(NULL); - } - PORT_Free(str); - return(res); -} - -static xmlChar* -xmlSecNssASN1IntegerWrite(SECItem *num) { - xmlChar *res = NULL; - int resLen = 64; /* not more than 64 chars */ - PRUint64 val = 0; - unsigned int ii = 0; - int shift = 0; - - xmlSecAssert2(num != NULL, NULL); - xmlSecAssert2(num->type == siBuffer, NULL); - xmlSecAssert2(num->len <= 9, NULL); - xmlSecAssert2(num->data != NULL, NULL); - - /* HACK : to be fixed after - * NSS bug http://bugzilla.mozilla.org/show_bug.cgi?id=212864 is fixed - */ - for(ii = num->len; ii > 0; --ii, shift += 8) { - val |= ((PRUint64)num->data[ii - 1]) << shift; - } - - res = (xmlChar*)xmlMalloc(resLen + 1); - if(res == NULL) { - xmlSecMallocError(resLen + 1, NULL); - return (NULL); - } - - PR_snprintf((char*)res, resLen, "%llu", val); - return(res); -} - -static xmlChar* -xmlSecNssX509SKIWrite(CERTCertificate* cert) { - xmlChar *res = NULL; - SECItem ski; - SECStatus rv; - - xmlSecAssert2(cert != NULL, NULL); - - memset(&ski, 0, sizeof(ski)); - - rv = CERT_FindSubjectKeyIDExtension(cert, &ski); - if (rv != SECSuccess) { - xmlSecNssError("CERT_FindSubjectKeyIDExtension", NULL); - SECITEM_FreeItem(&ski, PR_FALSE); - return(NULL); - } - - res = xmlSecBase64Encode(ski.data, ski.len, 0); - if(res == NULL) { - xmlSecInternalError("xmlSecBase64Encode", NULL); - SECITEM_FreeItem(&ski, PR_FALSE); - return(NULL); - } - SECITEM_FreeItem(&ski, PR_FALSE); - - return(res); -} - - static void xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { SECItem *sn; diff --git a/src/nss/x509vfy.c b/src/nss/x509vfy.c index cd328fea..9f2aca41 100644 --- a/src/nss/x509vfy.c +++ b/src/nss/x509vfy.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -70,18 +71,7 @@ struct _xmlSecNssX509StoreCtx { static int xmlSecNssX509StoreInitialize (xmlSecKeyDataStorePtr store); static void xmlSecNssX509StoreFinalize (xmlSecKeyDataStorePtr store); -static int xmlSecNssX509NameStringRead (xmlSecByte **str, - int *strLen, - xmlSecByte *res, - int resLen, - xmlSecByte delim, - int ingoreTrailingSpaces); -static xmlSecByte * xmlSecNssX509NameRead (xmlSecByte *str, - int len); - -static int xmlSecNssNumToItem (SECItem *it, - PRUint64 num); - +static int xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ; static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = { sizeof(xmlSecKeyDataStoreKlass), @@ -359,7 +349,7 @@ xmlSecNssX509StoreFinalize(xmlSecKeyDataStorePtr store) { *****************************************************************************/ static CERTName * xmlSecNssGetCertName(const xmlChar * name) { - xmlChar *tmp, *name2; + xmlChar *name2; xmlChar *p; CERTName *res; @@ -379,24 +369,14 @@ xmlSecNssGetCertName(const xmlChar * name) { memcpy(p, " E=", 13); } - tmp = xmlSecNssX509NameRead(name2, xmlStrlen(name2)); - if(tmp == NULL) { - xmlSecInternalError2("xmlSecNssX509NameRead", NULL, - "name2=\"%s\"", xmlSecErrorsSafeString(name2)); - xmlFree(name2); - return(NULL); - } - - res = CERT_AsciiToName((char*)tmp); - if (res == NULL) { + res = CERT_AsciiToName((char*)name2); + if (name == NULL) { xmlSecNssError2("CERT_AsciiToName", NULL, - "ascii=\"%s\"", xmlSecErrorsSafeString((char*)tmp)); - PORT_Free(tmp); + "ascii=\"%s\"", xmlSecErrorsSafeString((char*)name2)); xmlFree(name2); return(NULL); } - PORT_Free(tmp); return(res); } @@ -472,15 +452,8 @@ xmlSecNssX509FindCert(CERTCertList* certsList, const xmlChar *subjectName, issuerAndSN.derIssuer.data = nameitem->data; issuerAndSN.derIssuer.len = nameitem->len; - /* TBD: serial num can be arbitrarily long */ - if(PR_sscanf((char *)issuerSerial, "%llu", &issuerSN) != 1) { - xmlSecNssError("PR_sscanf(issuerSerial)", NULL); - SECITEM_FreeItem(&issuerAndSN.serialNumber, PR_FALSE); - goto done; - } - - rv = xmlSecNssNumToItem(&issuerAndSN.serialNumber, issuerSN); - if(rv <= 0) { + rv = xmlSecNssIntegerToItem( issuerSerial, &issuerAndSN.serialNumber ); + if(rv < 0) { xmlSecInternalError("xmlSecNssNumToItem(serialNumber)", NULL); SECITEM_FreeItem(&issuerAndSN.serialNumber, PR_FALSE); goto done; @@ -551,140 +524,6 @@ done: return(cert); } -static xmlSecByte * -xmlSecNssX509NameRead(xmlSecByte *str, int len) { - xmlSecByte name[256]; - xmlSecByte value[256]; - xmlSecByte *retval = NULL; - xmlSecByte *p = NULL; - int nameLen, valueLen; - - xmlSecAssert2(str != NULL, NULL); - - /* return string should be no longer than input string */ - retval = (xmlSecByte *)PORT_Alloc(len+1); - if(retval == NULL) { - xmlSecNssError2("PORT_Alloc", NULL, - "size=%d", (len+1)); - return(NULL); - } - p = retval; - - while(len > 0) { - /* skip spaces after comma or semicolon */ - while((len > 0) && isspace(*str)) { - ++str; --len; - } - - nameLen = xmlSecNssX509NameStringRead(&str, &len, name, sizeof(name), '=', 0); - if(nameLen < 0) { - xmlSecInternalError("xmlSecNssX509NameStringRead", NULL); - goto done; - } - memcpy(p, name, nameLen); - p+=nameLen; - *p++='='; - if(len > 0) { - ++str; --len; - if((*str) == '\"') { - valueLen = xmlSecNssX509NameStringRead(&str, &len, - value, sizeof(value), '"', 1); - if(valueLen < 0) { - xmlSecInternalError("xmlSecNssX509NameStringRead", NULL); - goto done; - } - /* skip spaces before comma or semicolon */ - while((len > 0) && isspace(*str)) { - ++str; --len; - } - if((len > 0) && ((*str) != ',')) { - xmlSecInvalidIntegerDataError("char", (*str), "comma ','", NULL); - goto done; - } - if(len > 0) { - ++str; --len; - } - *p++='\"'; - memcpy(p, value, valueLen); - p+=valueLen; - *p++='\"'; - } else if((*str) == '#') { - /* TODO: read octect values */ - xmlSecNotImplementedError("reading octect values is not implemented yet"); - goto done; - } else { - valueLen = xmlSecNssX509NameStringRead(&str, &len, - value, sizeof(value), ',', 1); - if(valueLen < 0) { - xmlSecInternalError("xmlSecNssX509NameStringRead", NULL); - goto done; - } - memcpy(p, value, valueLen); - p+=valueLen; - if (len > 0) { - *p++=','; - } - } - } - if(len > 0) { - ++str; --len; - } - } - - *p = 0; - return(retval); - -done: - PORT_Free(retval); - return (NULL); -} - -static int -xmlSecNssX509NameStringRead(xmlSecByte **str, int *strLen, - xmlSecByte *res, int resLen, - xmlSecByte delim, int ingoreTrailingSpaces) { - xmlSecByte *p, *q, *nonSpace; - - xmlSecAssert2(str != NULL, -1); - xmlSecAssert2(strLen != NULL, -1); - xmlSecAssert2(res != NULL, -1); - - p = (*str); - nonSpace = q = res; - while(((p - (*str)) < (*strLen)) && ((*p) != delim) && ((q - res) < resLen)) { - if((*p) != '\\') { - if(ingoreTrailingSpaces && !isspace(*p)) { - nonSpace = q; - } - *(q++) = *(p++); - } else { - ++p; - nonSpace = q; - if(xmlSecIsHex((*p))) { - if((p - (*str) + 1) >= (*strLen)) { - xmlSecInvalidDataError("two hex digits expected", NULL); - return(-1); - } - *(q++) = xmlSecGetHex(p[0]) * 16 + xmlSecGetHex(p[1]); - p += 2; - } else { - if(((++p) - (*str)) >= (*strLen)) { - xmlSecInvalidDataError("escaped symbol missed", NULL); - return(-1); - } - *(q++) = *(p++); - } - } - } - if(((p - (*str)) < (*strLen)) && ((*p) != delim)) { - xmlSecInvalidSizeOtherError("buffer is too small", NULL); - return(-1); - } - (*strLen) -= (p - (*str)); - (*str) = p; - return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res); -} - /* code lifted from NSS */ static int xmlSecNssNumToItem(SECItem *it, PRUint64 ui) @@ -721,6 +560,77 @@ xmlSecNssNumToItem(SECItem *it, PRUint64 ui) PORT_Memcpy(it->data, bb + (zeros_len - 1), it->len); return(it->len); } + +static int +xmlSecNssIntegerToItem( + const xmlChar* integer , + SECItem *item +) { + xmlSecBn bn ; + xmlSecSize i, length ; + const xmlSecByte* bnInteger ; + + xmlSecAssert2( integer != NULL, -1 ) ; + xmlSecAssert2( item != NULL, -1 ) ; + + if( xmlSecBnInitialize( &bn, 0 ) < 0 ) { + xmlSecError(XMLSEC_ERRORS_HERE, + NULL, + "xmlSecBnInitialize", + XMLSEC_ERRORS_R_INVALID_DATA, + XMLSEC_ERRORS_NO_MESSAGE); + return -1 ; + } + + if( xmlSecBnFromDecString( &bn, integer ) < 0 ) { + xmlSecError(XMLSEC_ERRORS_HERE, + NULL, + "xmlSecBnFromDecString", + XMLSEC_ERRORS_R_INVALID_DATA, + XMLSEC_ERRORS_NO_MESSAGE); + xmlSecBnFinalize( &bn ) ; + return -1 ; + } + + length = xmlSecBnGetSize( &bn ) ; + if( length <= 0 ) { + xmlSecError(XMLSEC_ERRORS_HERE, + NULL, + "xmlSecBnGetSize", + XMLSEC_ERRORS_R_INVALID_DATA, + XMLSEC_ERRORS_NO_MESSAGE); + } + + bnInteger = xmlSecBnGetData( &bn ) ; + if( bnInteger == NULL ) { + xmlSecError(XMLSEC_ERRORS_HERE, + NULL, + "xmlSecBnGetData", + XMLSEC_ERRORS_R_INVALID_DATA, + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecBnFinalize( &bn ) ; + return -1 ; + } + + item->data = ( unsigned char * )PORT_Alloc( length ); + if( item->data == NULL ) { + xmlSecError(XMLSEC_ERRORS_HERE, + NULL, + "PORT_Alloc", + XMLSEC_ERRORS_R_INVALID_DATA, + XMLSEC_ERRORS_NO_MESSAGE ) ; + xmlSecBnFinalize( &bn ) ; + return -1 ; + } + + item->len = length; + for( i = 0 ; i < length ; i ++ ) + item->data[i] = *( bnInteger + i ) ; + + xmlSecBnFinalize( &bn ) ; + + return 0 ; +} #endif /* XMLSEC_NO_X509 */ -- 2.13.5