Replace PKCS5 with GC.

diff --git a/lib/x509/pkcs5.c b/lib/x509/pkcs5.c
deleted file mode 100644 (file)
index 183b6fc..0000000
--- a/lib/x509/pkcs5.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* pkcs5.c     Implementation of Password-Based Cryptography as per PKCS#5
- * Copyright (C) 2002,2003 Simon Josefsson
- * Copyright (C) 2004 Free Software Foundation
- *
- * This file 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.
- *
- * This file 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 file; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include <gnutls_int.h>
-
-#ifdef ENABLE_PKI
-
-#include <pkcs12.h>
-#include <gcrypt.h>
-#include "pkcs5.h"
-
-/*
- * 5.2 PBKDF2
- *
- *  PBKDF2 applies a pseudorandom function (see Appendix B.1 for an
- *  example) to derive keys. The length of the derived key is essentially
- *  unbounded. (However, the maximum effective search space for the
- *  derived key may be limited by the structure of the underlying
- *  pseudorandom function. See Appendix B.1 for further discussion.)
- *  PBKDF2 is recommended for new applications.
- *
- *  PBKDF2 (P, S, c, dkLen)
- *
- *  Options:        PRF        underlying pseudorandom function (hLen
- *                             denotes the length in octets of the
- *                             pseudorandom function output)
- *
- *  Input:          P          password, an octet string (ASCII or UTF-8)
- *                  S          salt, an octet string
- *                  c          iteration count, a positive integer
- *                  dkLen      intended length in octets of the derived
- *                             key, a positive integer, at most
- *                             (2^32 - 1) * hLen
- *
- *  Output:         DK         derived key, a dkLen-octet string
- */
-
-#define MAX_PRF_BLOCK_LEN 80
-
-int
-_gnutls_pkcs5_pbkdf2(int PRF,
-                    const char *P,
-                    size_t Plen,
-                    const unsigned char *S,
-                    size_t Slen, unsigned int c, unsigned int dkLen,
-                    char *DK)
-{
-    gcry_md_hd_t prf;
-    gcry_error_t err;
-    char U[MAX_PRF_BLOCK_LEN];
-    char T[MAX_PRF_BLOCK_LEN];
-    unsigned int u;
-    unsigned int hLen = gcry_md_get_algo_dlen(PRF);
-    unsigned int l;
-    unsigned int r;
-    int rc;
-    unsigned char *p;
-    int i;
-    int k;
-
-    if (hLen == 0 || hLen > MAX_PRF_BLOCK_LEN)
-       return PKCS5_INVALID_PRF;
-
-    if (c == 0)
-       return PKCS5_INVALID_ITERATION_COUNT;
-
-    if (dkLen == 0)
-       return PKCS5_INVALID_DERIVED_KEY_LENGTH;
-
-    /*
-     *
-     *  Steps:
-     *
-     *     1. If dkLen > (2^32 - 1) * hLen, output "derived key too long" and
-     *        stop.
-     */
-
-    if (dkLen > 4294967295U)
-       return PKCS5_DERIVED_KEY_TOO_LONG;
-
-    /*
-     *     2. Let l be the number of hLen-octet blocks in the derived key,
-     *        rounding up, and let r be the number of octets in the last
-     *        block:
-     *
-     *                  l = CEIL (dkLen / hLen) ,
-     *                  r = dkLen - (l - 1) * hLen .
-     *
-     *        Here, CEIL (x) is the "ceiling" function, i.e. the smallest
-     *        integer greater than, or equal to, x.
-     */
-
-    l = dkLen / hLen;
-    if (dkLen % hLen)
-       l++;
-    r = dkLen - (l - 1) * hLen;
-
-    /*
-     *     3. For each block of the derived key apply the function F defined
-     *        below to the password P, the salt S, the iteration count c, and
-     *        the block index to compute the block:
-     *
-     *                  T_1 = F (P, S, c, 1) ,
-     *                  T_2 = F (P, S, c, 2) ,
-     *                  ...
-     *                  T_l = F (P, S, c, l) ,
-     *
-     *        where the function F is defined as the exclusive-or sum of the
-     *        first c iterates of the underlying pseudorandom function PRF
-     *        applied to the password P and the concatenation of the salt S
-     *        and the block index i:
-     *
-     *                  F (P, S, c, i) = U_1 \xor U_2 \xor ... \xor U_c
-     *
-     *        where
-     *
-     *                  U_1 = PRF (P, S || INT (i)) ,
-     *                  U_2 = PRF (P, U_1) ,
-     *                  ...
-     *                  U_c = PRF (P, U_{c-1}) .
-     *
-     *        Here, INT (i) is a four-octet encoding of the integer i, most
-     *        significant octet first.
-     *
-     *     4. Concatenate the blocks and extract the first dkLen octets to
-     *        produce a derived key DK:
-     *
-     *                  DK = T_1 || T_2 ||  ...  || T_l<0..r-1>
-     *
-     *     5. Output the derived key DK.
-     *
-     *  Note. The construction of the function F follows a "belt-and-
-     *  suspenders" approach. The iterates U_i are computed recursively to
-     *  remove a degree of parallelism from an opponent; they are exclusive-
-     *  ored together to reduce concerns about the recursion degenerating
-     *  into a small set of values.
-     *
-     */
-
-    err = gcry_md_open(&prf, PRF, GCRY_MD_FLAG_HMAC);
-    if (err)
-       return PKCS5_INVALID_PRF;
-
-    for (i = 1; (uint) i <= l; i++) {
-       memset(T, 0, hLen);
-
-       for (u = 1; u <= c; u++) {
-           gcry_md_reset(prf);
-
-           rc = gcry_md_setkey(prf, P, Plen);
-           if (rc)
-               return PKCS5_INVALID_PRF;
-
-           if (u == 1) {
-               char *tmp;
-               size_t tmplen = Slen + 4;
-
-               tmp = gnutls_alloca(tmplen);
-               if (tmp == NULL)
-                   return PKCS5_INVALID_PRF;
-
-               memcpy(tmp, S, Slen);
-               tmp[Slen + 0] = (i & 0xff000000) >> 24;
-               tmp[Slen + 1] = (i & 0x00ff0000) >> 16;
-               tmp[Slen + 2] = (i & 0x0000ff00) >> 8;
-               tmp[Slen + 3] = (i & 0x000000ff) >> 0;
-
-               gcry_md_write(prf, tmp, tmplen);
-               gnutls_afree(tmp);
-           } else {
-               gcry_md_write(prf, U, hLen);
-           }
-
-           p = gcry_md_read(prf, PRF);
-           if (p == NULL)
-               return PKCS5_INVALID_PRF;
-
-           memcpy(U, p, hLen);
-
-           for (k = 0; (uint) k < hLen; k++)
-               T[k] ^= U[k];
-       }
-
-       memcpy(DK + (i - 1) * hLen, T, (uint) i == l ? r : hLen);
-    }
-
-    gcry_md_close(prf);
-
-    return PKCS5_OK;
-}
-
-#endif

diff --git a/lib/x509/pkcs5.h b/lib/x509/pkcs5.h
deleted file mode 100644 (file)
index a940730..0000000
--- a/lib/x509/pkcs5.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* pkcs5.h     header file for pkcs5 functions                       -*- c -*-
- * Copyright (C) 2002  Simon Josefsson
- *
- * This file 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.
- *
- * This file 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 file; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef PKCS5_H
-#define PKCS5_H
-
-/* This should be discarded as soon as this functionality moved
- * to libgcrypt.
- */
-
-/* PRF types */
-enum
-{
-  /* XXX must be synchronized with libgcrypt */
-  PKCS5_PRF_MD5 = 1,
-  PKCS5_PRF_SHA1 = 2,
-  PKCS5_PRF_RMD160 = 3,
-  PKCS5_PRF_MD2 = 5,
-  PKCS5_PRF_TIGER = 6,
-  PKCS5_PRF_HAVAL = 7,
-  PKCS5_PRF_SHA256 = 8,
-  PKCS5_PRF_SHA384 = 9,
-  PKCS5_PRF_SHA512 = 10,
-  PKCS5_PRF_MD4 = 11
-};
-
-/* Error codes */
-enum
-{
-  PKCS5_OK = 0,
-  PKCS5_INVALID_PRF,
-  PKCS5_INVALID_ITERATION_COUNT,
-  PKCS5_INVALID_DERIVED_KEY_LENGTH,
-  PKCS5_DERIVED_KEY_TOO_LONG
-};
-
-extern int
-_gnutls_pkcs5_pbkdf2 (int PRF,
-       const char *P,
-       size_t Plen,
-       const unsigned char *S,
-       size_t Slen, unsigned int c, unsigned int dkLen, char *DK);
-
-#endif /* PKCS5_H */

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index b2109649371822f92fc906cb95555bc9f26e275c..d4ff0e65c726f81c89e00637f3dc67193640013b 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -33,7 +33,6 @@
 #include <x509_b64.h>
 #include <x509.h>
 #include <dn.h>
-#include <pkcs5.h>
 #include <pkcs12.h>
 #include <privkey.h>
 #include <extensions.h>
@@ -1233,12 +1232,11 @@ static int decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
      */
     if (schema == PBES2) {
        result =
-           _gnutls_pkcs5_pbkdf2(PKCS5_PRF_SHA1, password,
-                                strlen(password), kdf_params->salt,
-                                kdf_params->salt_size,
+           gc_pkcs5_pbkdf2_sha1(password, strlen(password),
+                                kdf_params->salt, kdf_params->salt_size,
                                 kdf_params->iter_count, key_size, key);
 
-       if (result != PKCS5_OK) {
+       if (result != GC_OK) {
            gnutls_assert();
            result = GNUTLS_E_DECRYPTION_FAILED;
            goto error;
@@ -1507,12 +1505,11 @@ static int generate_key(schema_id schema,
 
     if (schema == PBES2) {
 
-       ret = _gnutls_pkcs5_pbkdf2(PKCS5_PRF_SHA1, password,
-                                  strlen(password), kdf_params->salt,
-                                  kdf_params->salt_size,
+       ret = gc_pkcs5_pbkdf2_sha1(password, strlen(password),
+                                  kdf_params->salt, kdf_params->salt_size,
                                   kdf_params->iter_count,
                                   kdf_params->key_size, key->data);
-       if (ret != PKCS5_OK) {
+       if (ret != GC_OK) {
            gnutls_assert();
            return GNUTLS_E_ENCRYPTION_FAILED;
        }