===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.323
retrieving revision 1.324
diff -c -r1.323 -r1.324
*** www/events.html	2005/03/07 20:18:19	1.323
--- www/events.html	2005/03/07 22:59:52	1.324
***************
*** 28,40 ****
  <li><strong><a name=bcs2005></a>
  <a href="http://www.bellua.com/bcs2005/asia05.index.html">Bellua Cyber Security Asia 2005</a></strong>,
  March 21-24, 2005, Jakarta, Indonesia.<br>
! Ryan McBride will be presenting two talks: an overview of PF which
  discusses how its advanced features work together in some important
  applications and compares PF with the other major commercial and open
! source firewalls, and a talk on OpenBSD's implementation of network
! stack randomness and how this protects against known and unknown attacks.
  <p>
  
  <li><strong><a name=bsdcan2005></a>
  <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
  May 13 - 14, 2005, Ottawa, Canada.<br>
--- 28,49 ----
  <li><strong><a name=bcs2005></a>
  <a href="http://www.bellua.com/bcs2005/asia05.index.html">Bellua Cyber Security Asia 2005</a></strong>,
  March 21-24, 2005, Jakarta, Indonesia.<br>
! Ryan McBride will be presenting an overview of PF which
  discusses how its advanced features work together in some important
  applications and compares PF with the other major commercial and open
! source firewalls.
  <p>
  
+ <li><strong><a name=csw2005></a>
+ <a href="http://www.cansecwest.com/">cansecwest/core05</a></strong>,
+ May 4-6, 2005, Vancouver, Canada.<br>
+ There will be a number of OpenBSD developers in attendance, including
+ Theo de Raadt and Ryan McBride. We'll have early access 3.7 CDs to sell, and
+ Ryan McBride may be presenting a talk on Network Stack Randomness: how it
+ protects against known and unknown attacks, and details of OpenBSDs
+ implementation.
+ <p>
+ 
  <li><strong><a name=bsdcan2005></a>
  <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
  May 13 - 14, 2005, Ottawa, Canada.<br>
***************
*** 1357,1363 ****
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.323 2005/03/07 20:18:19 mcbride Exp $</small>
  
  </body>
  </html>
--- 1366,1372 ----
  <hr>
  <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
  <a href="mailto:www@openbsd.org">www@openbsd.org</a>
! <br><small>$OpenBSD: events.html,v 1.324 2005/03/07 22:59:52 mcbride Exp $</small>
  
  </body>
  </html>