X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=crypto%2Fasn1%2Fp7_lib.c;h=b1196ef581ceac7562fbdb1a7859b95ccbcc96b1;hb=66ebbb6a56bc1688fa37878e4feec985b0c260d7;hp=76cb675497c28f6b256d60e612f94779bb81a1a6;hpb=eaa28181898b8ca0b54552a3290789bb17444c8a;p=openssl.git

diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c
index 76cb675497..b1196ef581 100644
--- a/crypto/asn1/p7_lib.c
+++ b/crypto/asn1/p7_lib.c
@@ -104,6 +104,7 @@ int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
 			M_ASN1_I2D_len(a->d.encrypted,i2d_PKCS7_ENCRYPT);
 			break;
 		default:
+			M_ASN1_I2D_len(a->d.other,i2d_ASN1_TYPE);
 			break;
 			}
 		}
@@ -138,6 +139,7 @@ int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
 			M_ASN1_I2D_put(a->d.encrypted,i2d_PKCS7_ENCRYPT);
 			break;
 		default:
+			M_ASN1_I2D_put(a->d.other,i2d_ASN1_TYPE);
 			break;
 			}
 		M_ASN1_I2D_INF_seq_end();
@@ -189,6 +191,7 @@ int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
 			M_ASN1_I2D_len(a->d.encrypted,i2d_PKCS7_ENCRYPT);
 			break;
 		default:
+			M_ASN1_I2D_len(a->d.other,i2d_ASN1_TYPE);
 			break;
 			}
 		/* Work out explicit tag content size */
@@ -228,6 +231,7 @@ int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
 			M_ASN1_I2D_put(a->d.encrypted,i2d_PKCS7_ENCRYPT);
 			break;
 		default:
+			M_ASN1_I2D_put(a->d.other,i2d_ASN1_TYPE);
 			break;
 			}
 		}
@@ -298,10 +302,8 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, unsigned char **pp, long length)
 			M_ASN1_D2I_get(ret->d.encrypted,d2i_PKCS7_ENCRYPT);
 			break;
 		default:
-			c.error=ASN1_R_BAD_PKCS7_TYPE;
-			c.line=__LINE__;
-			goto err;
-			/* break; */
+			M_ASN1_D2I_get(ret->d.other,d2i_ASN1_TYPE);
+			break;
 			}
 		if (Tinf == (1|V_ASN1_CONSTRUCTED))
 			{
@@ -378,7 +380,7 @@ void PKCS7_content_free(PKCS7 *a)
 			PKCS7_ENCRYPT_free(a->d.encrypted);
 			break;
 		default:
-			/* MEMORY LEAK */
+			ASN1_TYPE_free(a->d.other);
 			break;
 			}
 		}