summaryrefslogtreecommitdiffstats
path: root/crypto/cms/cms_err.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-02-26 16:48:49 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-02-26 17:06:08 +0000
commite1dee801b9f2f4e5db0099e12628e0dbd7afdd90 (patch)
tree73131f01d8ba4e338f84c64898ef0dcd77d9e5e1 /crypto/cms/cms_err.c
parent3c53fd892c69eef3c0a210a049102b66f33d69a3 (diff)
Add function CMS_RecipientInfo_encrypt
Add CMS_RecipientInfo_encrypt: this function encrypts an existing content encryption key to match the key in the RecipientInfo structure: this is useful if a new recpient is added to and existing enveloped data structure. Add documentation. (cherry picked from commit e1f1d28f34cc5cfc87772e0d8331e00137a4a213)
Diffstat (limited to 'crypto/cms/cms_err.c')
-rw-r--r--crypto/cms/cms_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index 8330ead7ed..cc58ea5f96 100644
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -1,6 +1,6 @@
/* crypto/cms/cms_err.c */
/* ====================================================================
- * Copyright (c) 1999-2009 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 1999-2013 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -114,6 +114,7 @@ static ERR_STRING_DATA CMS_str_functs[]=
{ERR_FUNC(CMS_F_CMS_RECEIPTREQUEST_CREATE0), "CMS_ReceiptRequest_create0"},
{ERR_FUNC(CMS_F_CMS_RECEIPT_VERIFY), "cms_Receipt_verify"},
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_DECRYPT), "CMS_RecipientInfo_decrypt"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_ENCRYPT), "CMS_RecipientInfo_encrypt"},
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT), "CMS_RECIPIENTINFO_KEKRI_DECRYPT"},
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT), "CMS_RECIPIENTINFO_KEKRI_ENCRYPT"},
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID), "CMS_RecipientInfo_kekri_get0_id"},