OpenSSL 0.9.4 merge

1 files changed, 6 insertions, 13 deletions

diff --git a/src/lib/libcrypto/asn1/a_bmp.c b/src/lib/libcrypto/asn1/a_bmp.c
index 774502b1fc..6075871984 100644
--- a/src/lib/libcrypto/asn1/a_bmp.c
+++ b/src/lib/libcrypto/asn1/a_bmp.c
@@ -58,31 +58,24 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
+#include <openssl/asn1.h>
 
-/* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER);
- */
-
-int i2d_ASN1_BMPSTRING(a, pp)
-ASN1_BMPSTRING *a;
-unsigned char **pp;
+int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp)
         {
         return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
                 V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL));
         }
 
-ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(a, pp, length)
-ASN1_BMPSTRING **a;
-unsigned char **pp;
-long length;
+ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(ASN1_BMPSTRING **a, unsigned char **pp,
+             long length)
         {
         ASN1_BMPSTRING *ret=NULL;
 
         ret=(ASN1_BMPSTRING *)d2i_ASN1_bytes((ASN1_STRING **)a,
-        pp,length,V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL);
+                pp,length,V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL);
         if (ret == NULL)
                 {
-                ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_ERROR_STACK);
+                ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ERR_R_NESTED_ASN1_ERROR);
                 return(NULL);
                 }
         return(ret);