[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  367071f121d7e941846f612fba60dbb1d12cf9dd (commit)
      from  55327ddfc13d9b9e48fb2d5287e9698a9589790c (commit)


- Log -----------------------------------------------------------------
commit 367071f121d7e941846f612fba60dbb1d12cf9dd
Author: Rob Percival <robpercival at google.com>
Date:   Mon Mar 21 15:29:52 2016 +0000

    Adds s2i function for ct_precert_poison X509 extension
    
    Allows CONF files for certificate requests to specify that a pre-
    certificate should be created (see RFC6962).
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/ct/ct_x509v3.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c
index ac37231..ed361dc 100644
--- a/crypto/ct/ct_x509v3.c
+++ b/crypto/ct/ct_x509v3.c
@@ -67,6 +67,11 @@ static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
     return OPENSSL_strdup("NULL");
 }
 
+static void *s2i_poison(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str)
+{
+   return ASN1_NULL_new();
+}
+
 static int i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list,
                  BIO *out, int indent)
 {
@@ -88,7 +93,7 @@ const X509V3_EXT_METHOD v3_ct_scts[] = {
     /* X509v3 extension to mark a certificate as a pre-certificate */
     { NID_ct_precert_poison, 0, ASN1_ITEM_ref(ASN1_NULL),
     NULL, NULL, NULL, NULL,
-    i2s_poison, NULL,
+    i2s_poison, s2i_poison,
     NULL, NULL,
     NULL, NULL,
     NULL },