*** empty log message ***

diff --git a/doc/TODO b/doc/TODO
index ffe64207059855ac894b6e77a186ae1b099ded74..46e131595320eaf25ed665df56ecd9e20953d598 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,13 +3,12 @@ anything), contact the developer's mailing list (gnutls-dev@lists.gnupg.org),
 in order to avoid having people working on the same thing. 
 
 Current list:
-* Add ability to read PKCS-12 structures (certificate and private key)
 * Update to the latest SRP Draft.
 * Add a callback function in certificate authentication, to receive
   the certificate and the private key.
 * Convert documentation to texinfo format
 * Audit the code
-* Allow sending V2 Hello messages. It seems that some broken 
+* Allow sending V2 Hello messages. It seems that some (old) broken 
   implementations require that.
 * Add GPGSM certificate manager support
 * Allow unexpected Client Hello messages

diff --git a/doc/tex/ex-pkcs12.tex b/doc/tex/ex-pkcs12.tex
index d97655989b917469b2f6cb1e95536a5d7bac6b25..eca1ac9d79a8a0c1bf5968b9d4e5f54cf7a9ae88 100644 (file)
--- a/doc/tex/ex-pkcs12.tex
+++ b/doc/tex/ex-pkcs12.tex
@@ -25,7 +25,7 @@ int write_pkcs12(const gnutls_datum * cert, const gnutls_datum * pkcs8_key,
    /* A good idea might be to use gnutls_x509_privkey_get_key_id()
     * to obtain a unique ID.
     */
-   gnutls_datum key_id = { "\x00\x00\x00\x01", 4 };
+   gnutls_datum key_id = { "\x00\x00\x07", 3 };
 
    gnutls_global_init();
    gnutls_global_set_log_level(2);

diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index 8518c691461cc92afa3930a8530da4410b9e3695..72ff6b848901143b54e3419309ab3c9cd01ee75d 100644 (file)
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -1,24 +1,26 @@
 /* This is based on minip12.
  */
 
-/* minip12.c - A minilam pkcs-12 implementation.
+/*  minip12.c - A minilam pkcs-12 implementation.
  *     Copyright (C) 2002 Free Software Foundation, Inc.
  *
- * This file is part of GnuPG.
+ *  This file some day was part of GnuPG.
+ *  This file is part of GNUTLS.
  *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ *  The GNUTLS library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public   
+ *  License as published by the Free Software Foundation; either 
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
 #include <gnutls_int.h>