Fix EVP CCM decrypt. Add decrypt support to algorithm test program.

[openssl.git] / crypto / asn1 / nsseq.c

diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
index 34b16c4c46df37b0f855ed0cadac89ff1e601f0e..b8c420223090f9118da62406465b2501fe6067ff 100644 (file)
--- a/crypto/asn1/nsseq.c
+++ b/crypto/asn1/nsseq.c
@@ -1,9 +1,9 @@
 /* nsseq.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -58,64 +58,26 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/err.h>
+#include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/objects.h>
 
-/* Netscape certificate sequence structure */
-
-/*
- * ASN1err(ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW,ERR_R_MALLOC_FAILURE);
- * ASN1err(ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE,ERR_R_MALLOC_FAILURE);
- */
-
-int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp)
+static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
+                                                       void *exarg)
 {
-       int v = 0;
-       M_ASN1_I2D_vars(a);
-       M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_len_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0,
-                                                        V_ASN1_SEQUENCE, v);
-
-       M_ASN1_I2D_seq_total();
-
-       M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_put_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0,
-                                                        V_ASN1_SEQUENCE, v);
-
-       M_ASN1_I2D_finish();
+       if(operation == ASN1_OP_NEW_POST) {
+               NETSCAPE_CERT_SEQUENCE *nsseq;
+               nsseq = (NETSCAPE_CERT_SEQUENCE *)*pval;
+               nsseq->type = OBJ_nid2obj(NID_netscape_cert_sequence);
+       }
+       return 1;
 }
 
-NETSCAPE_CERT_SEQUENCE *NETSCAPE_CERT_SEQUENCE_new(void)
-{
-       NETSCAPE_CERT_SEQUENCE *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, NETSCAPE_CERT_SEQUENCE);
-       /* Note hardcoded object type */
-       ret->type = OBJ_nid2obj(NID_netscape_cert_sequence);
-       ret->certs = NULL;
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW);
-}
+/* Netscape certificate sequence structure */
 
-NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a,
-            unsigned char **pp, long length)
-{
-       M_ASN1_D2I_vars(a,NETSCAPE_CERT_SEQUENCE *,
-                                       NETSCAPE_CERT_SEQUENCE_new);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
-       M_ASN1_D2I_get_EXP_set_opt(ret->certs, d2i_X509, X509_free, 0,
-                                                        V_ASN1_SEQUENCE);
-       M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free, ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE);
-}
+ASN1_SEQUENCE_cb(NETSCAPE_CERT_SEQUENCE, nsseq_cb) = {
+       ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
+       ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
+} ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
 
-void NETSCAPE_CERT_SEQUENCE_free (NETSCAPE_CERT_SEQUENCE *a)
-{
-       if (a == NULL) return;
-       ASN1_OBJECT_free(a->type);
-       if(a->certs) sk_pop_free(a->certs, X509_free);
-       Free ((char *)a);
-}
+IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)