[CVS] OpenSSL: openssl/ CHANGES openssl/crypto/pkcs7/ pk7_lib.c pkcs7....

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /e/openssl/cvs                   Email:  steve@xxxxxxxxxxx
  Module: openssl                          Date:   11-Oct-2003 01:40:47
  Branch: HEAD                             Handle: 2003101100404601

  Modified files:
    openssl                 CHANGES
    openssl/crypto/pkcs7    pk7_lib.c pkcs7.h

  Log:
    New function to initialize a PKCS7 structure of type other.

  Summary:
    Revision    Changes     Path
    1.1167      +7  -0      openssl/CHANGES
    1.30        +7  -0      openssl/crypto/pkcs7/pk7_lib.c
    1.49        +1  -0      openssl/crypto/pkcs7/pkcs7.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1166 -r1.1167 CHANGES
  --- openssl/CHANGES   10 Oct 2003 23:25:42 -0000      1.1166
  +++ openssl/CHANGES   10 Oct 2003 23:40:46 -0000      1.1167
  @@ -4,6 +4,13 @@
   
    Changes between 0.9.7c and 0.9.8  [xx XXX xxxx]
   
  +  *) New function PKCS7_set0_type_other() this initializes a PKCS7 
  +     structure of type "other".
  +     [Steve Henson]
  +
  +  *) Correctly initialize digested data content type in PKCS7_set_type().
  +     [Steve Henson]
  +
     *) Fix prime generation loop in crypto/bn/bn_prime.pl by making
        sure the loop does correctly stop and breaking ("division by zero")
        modulus operations are not performed. The (pre-generated) prime
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/crypto/pkcs7/pk7_lib.c
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 pk7_lib.c
  --- openssl/crypto/pkcs7/pk7_lib.c    10 Oct 2003 23:31:53 -0000      1.29
  +++ openssl/crypto/pkcs7/pk7_lib.c    10 Oct 2003 23:40:47 -0000      1.30
  @@ -211,6 +211,13 @@
        return(0);
        }
   
  +int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
  +     {
  +     p7->type = OBJ_nid2obj(type);
  +     p7->d.other = other;
  +     return 1;
  +     }
  +
   int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
        {
        int i,j,nid;
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/crypto/pkcs7/pkcs7.h
  ============================================================================
  $ cvs diff -u -r1.48 -r1.49 pkcs7.h
  --- openssl/crypto/pkcs7/pkcs7.h      1 Jun 2003 20:51:58 -0000       1.48
  +++ openssl/crypto/pkcs7/pkcs7.h      10 Oct 2003 23:40:47 -0000      1.49
  @@ -308,6 +308,7 @@
   long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
   
   int PKCS7_set_type(PKCS7 *p7, int type);
  +int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
   int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
   int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
        const EVP_MD *dgst);
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@xxxxxxxxxxx
Automated List Manager                           majordomo@xxxxxxxxxxx