[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  0fd2d5fa3c58e0a11f059becd1fcf063c05ea292 (commit)
      from  c0a445a9f279d8c4a519b58e52a50112f2341070 (commit)


- Log -----------------------------------------------------------------
commit 0fd2d5fa3c58e0a11f059becd1fcf063c05ea292
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Feb 8 21:14:50 2016 +0000

    add missing file p12_lcl.h
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/pkcs12/Makefile.in                     |  2 +-
 crypto/{x509v3/tabtest.c => pkcs12/p12_lcl.h} | 62 ++++++++++++++-------------
 2 files changed, 33 insertions(+), 31 deletions(-)
 copy crypto/{x509v3/tabtest.c => pkcs12/p12_lcl.h} (75%)

diff --git a/crypto/pkcs12/Makefile.in b/crypto/pkcs12/Makefile.in
index 2797939..1b8d80e 100644
--- a/crypto/pkcs12/Makefile.in
+++ b/crypto/pkcs12/Makefile.in
@@ -24,7 +24,7 @@ LIBOBJ= p12_add.o p12_asn.o p12_attr.o p12_crpt.o p12_crt.o p12_decr.o \
 
 SRC= $(LIBSRC)
 
-HEADER=	
+HEADER=	p12_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/crypto/x509v3/tabtest.c b/crypto/pkcs12/p12_lcl.h
similarity index 75%
copy from crypto/x509v3/tabtest.c
copy to crypto/pkcs12/p12_lcl.h
index 4a3d103..49dc90c 100644
--- a/crypto/x509v3/tabtest.c
+++ b/crypto/pkcs12/p12_lcl.h
@@ -1,6 +1,6 @@
 /*
  * Written by Dr Stephen N Henson (steve at openssl.org) for the OpenSSL project
- * 1999.
+ * 2016.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -56,36 +56,38 @@
  *
  */
 
-/*
- * Simple program to check the ext_dat.h is correct and print out problems if
- * it is not.
- */
-
-#include <stdio.h>
+struct PKCS12_MAC_DATA_st {
+    X509_SIG *dinfo;
+    ASN1_OCTET_STRING *salt;
+    ASN1_INTEGER *iter;         /* defaults to 1 */
+};
 
-#include <openssl/x509v3.h>
+struct PKCS12_st {
+    ASN1_INTEGER *version;
+    PKCS12_MAC_DATA *mac;
+    PKCS7 *authsafes;
+};
 
-#include "ext_dat.h"
+struct PKCS12_SAFEBAG_st {
+    ASN1_OBJECT *type;
+    union {
+        struct pkcs12_bag_st *bag; /* secret, crl and certbag */
+        struct pkcs8_priv_key_info_st *keybag; /* keybag */
+        X509_SIG *shkeybag;     /* shrouded key bag */
+        STACK_OF(PKCS12_SAFEBAG) *safes;
+        ASN1_TYPE *other;
+    } value;
+    STACK_OF(X509_ATTRIBUTE) *attrib;
+};
 
-main()
-{
-    int i, prev = -1, bad = 0;
-    X509V3_EXT_METHOD **tmp;
-    i = OSSL_NELEM(standard_exts);
-    if (i != STANDARD_EXTENSION_COUNT)
-        fprintf(stderr, "Extension number invalid expecting %d\n", i);
-    tmp = standard_exts;
-    for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++) {
-        if ((*tmp)->ext_nid < prev)
-            bad = 1;
-        prev = (*tmp)->ext_nid;
+struct pkcs12_bag_st {
+    ASN1_OBJECT *type;
+    union {
+        ASN1_OCTET_STRING *x509cert;
+        ASN1_OCTET_STRING *x509crl;
+        ASN1_OCTET_STRING *octet;
+        ASN1_IA5STRING *sdsicert;
+        ASN1_TYPE *other;       /* Secret or other bag */
+    } value;
+};
 
-    }
-    if (bad) {
-        tmp = standard_exts;
-        fprintf(stderr, "Extensions out of order!\n");
-        for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
-            printf("%d : %s\n", (*tmp)->ext_nid, OBJ_nid2sn((*tmp)->ext_nid));
-    } else
-        fprintf(stderr, "Order OK\n");
-}