Return error when a bit string indicates an invalid amount of bits left

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

diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
index 7659a13bd38e4127316a9ebd0aae717c00ecbb22..e8725e44f1f50e8c5b54ed74f1133f3bf2de2ce0 100644 (file)
--- a/crypto/asn1/a_octet.c
+++ b/crypto/asn1/a_octet.c
@@ -60,24 +60,12 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-int i2d_ASN1_OCTET_STRING(ASN1_OCTET_STRING *a, unsigned char **pp)
-       {
-       return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
-               V_ASN1_OCTET_STRING,V_ASN1_UNIVERSAL));
-       }
+ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
+{ return M_ASN1_OCTET_STRING_dup(x); }
 
-ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING(ASN1_OCTET_STRING **a,
-            unsigned char **pp, long length)
-       {
-       ASN1_OCTET_STRING *ret=NULL;
+int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b)
+{ return M_ASN1_OCTET_STRING_cmp(a, b); }
 
-       ret=(ASN1_OCTET_STRING *)d2i_ASN1_bytes((ASN1_STRING **)a,
-               pp,length,V_ASN1_OCTET_STRING,V_ASN1_UNIVERSAL);
-       if (ret == NULL)
-               {
-               ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ERR_R_NESTED_ASN1_ERROR);
-               return(NULL);
-               }
-       return(ret);
-       }
+int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d, int len)
+{ return M_ASN1_OCTET_STRING_set(x, d, len); }