OpenSSL: openssl/crypto/pkcs7/ pk7_lib.c pkcs7.h

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
27-Apr-2006 02:29:51
  Branch: HEAD                             Handle:
2006042701295000

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

  Log:
    New function to extract AlgorithmIdentifier for
PKCS7_RECIP_INFO.

  Summary:
    Revision    Changes     Path
    1.36        +6  -0      openssl/crypto/pkcs7/pk7_lib.c
    1.57        +1  -0      openssl/crypto/pkcs7/pkcs7.h
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/pkcs7/pk7_lib.c
 
============================================================
================
  $ cvs diff -u -r1.35 -r1.36 pk7_lib.c
  --- openssl/crypto/pkcs7/pk7_lib.c	27 Apr 2006 00:20:43
-0000	1.35
  +++ openssl/crypto/pkcs7/pk7_lib.c	27 Apr 2006 00:29:50
-0000	1.36
   -444,6 +444,12 
   		*psig = si->digest_enc_alg;
   	}
   
  +void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri,
X509_ALGOR **penc)
  +	{
  +	if (penc)
  +		*penc = ri->key_enc_algor;
  +	}
  +
   PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509
*x509)
   	{
   	PKCS7_RECIP_INFO *ri;
   .
  patch -p0 <<' .'
  Index: openssl/crypto/pkcs7/pkcs7.h
 
============================================================
================
  $ cvs diff -u -r1.56 -r1.57 pkcs7.h
  --- openssl/crypto/pkcs7/pkcs7.h	17 Apr 2006 17:12:22
-0000	1.56
  +++ openssl/crypto/pkcs7/pkcs7.h	27 Apr 2006 00:29:50
-0000	1.57
   -342,6 +342,7 
   PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509
*x509);
   void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si,
EVP_PKEY **pk,
   					X509_ALGOR **pdig, X509_ALGOR **psig);
  +void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri,
X509_ALGOR **penc);
   int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO
*ri);
   int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509
*x509);
   int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER
*cipher);
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org