Commit c524bc8c authored by ian.mcgreer%sun.com's avatar ian.mcgreer%sun.com
Browse files

some minor ckfw fixes

parent f4317172

security/nss/lib/ckfw/object.c

+2 −7
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 */



#ifdef DEBUG

static const char CVS_ID[] = "@(#) $RCSfile: object.c,v $ $Revision: 1.6 $ $Date: 2001/09/20 22:09:46 $ $Name:  $";

static const char CVS_ID[] = "@(#) $RCSfile: object.c,v $ $Revision: 1.7 $ $Date: 2001/11/16 19:41:49 $ $Name:  $";

#endif /* DEBUG */



/*
@@ -420,10 +420,6 @@ nssCKFWObject_IsTokenObject 
  }

#endif /* NSSDEBUG */



  if( CKR_OK != nssCKFWMutex_Lock(fwObject->mutex) ) {

    return CK_FALSE;

  }



  if( (void *)NULL == (void *)fwObject->mdObject->IsTokenObject ) {

    NSSItem item;

    NSSItem *pItem;
@@ -448,7 +444,6 @@ nssCKFWObject_IsTokenObject 
    fwObject->fwToken, fwObject->mdInstance, fwObject->fwInstance);



 done:

  (void)nssCKFWMutex_Unlock(fwObject->mutex);

  return b;

}
@@ -616,7 +611,7 @@ nssCKFWObject_GetAttribute 
  }

#endif /* NSSDEBUG */



  if( (void *)NULL == (void *)fwObject->mdObject->GetAttributeSize ) {

  if( (void *)NULL == (void *)fwObject->mdObject->GetAttribute ) {

    *pError = CKR_GENERAL_ERROR;

    return (NSSItem *)NULL;

  }

security/nss/lib/ckfw/token.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 */



#ifdef DEBUG

static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.6 $ $Date: 2001/11/16 18:10:24 $ $Name:  $";

static const char CVS_ID[] = "@(#) $RCSfile: token.c,v $ $Revision: 1.7 $ $Date: 2001/11/16 19:41:49 $ $Name:  $";

#endif /* DEBUG */



/*
@@ -1315,7 +1315,7 @@ nssCKFWToken_OpenSession 


  if( CK_TRUE == rw ) {

    /* Read-write session desired */

    if( CK_TRUE != nssCKFWToken_GetIsWriteProtected(fwToken) ) {

    if( CK_TRUE == nssCKFWToken_GetIsWriteProtected(fwToken) ) {

      *pError = CKR_TOKEN_WRITE_PROTECTED;

      goto done;

    }