OpenSSL 0.9.4 merge

1 files changed, 15 insertions, 23 deletions

diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index ebe34a3362..41ced49c19 100644
--- a/src/lib/libcrypto/asn1/evp_asn1.c
+++ b/src/lib/libcrypto/asn1/evp_asn1.c
@@ -58,26 +58,22 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
 
-int ASN1_TYPE_set_octetstring(a,data,len)
-ASN1_TYPE *a;
-unsigned char *data;
-int len;
+int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
         {
         ASN1_STRING *os;
 
         if ((os=ASN1_OCTET_STRING_new()) == NULL) return(0);
         if (!ASN1_OCTET_STRING_set(os,data,len)) return(0);
-        ASN1_TYPE_set(a,V_ASN1_OCTET_STRING,(char *)os);
+        ASN1_TYPE_set(a,V_ASN1_OCTET_STRING,os);
         return(1);
         }
 
-int ASN1_TYPE_get_octetstring(a,data,max_len)
-ASN1_TYPE *a;
-unsigned char *data;
-int max_len; /* for returned value */
+/* int max_len:  for returned value    */
+int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data,
+             int max_len)
         {
         int ret,num;
         unsigned char *p;
@@ -97,11 +93,8 @@ int max_len; /* for returned value */
         return(ret);
         }
 
-int ASN1_TYPE_set_int_octetstring(a,num,data,len)
-ASN1_TYPE *a;
-long num;
-unsigned char *data;
-int len;
+int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
+             int len)
         {
         int n,size;
         ASN1_OCTET_STRING os,*osp;
@@ -131,16 +124,15 @@ int len;
           i2d_ASN1_INTEGER(&in,&p);
         M_i2d_ASN1_OCTET_STRING(&os,&p);
 
-        ASN1_TYPE_set(a,V_ASN1_SEQUENCE,(char *)osp);
+        ASN1_TYPE_set(a,V_ASN1_SEQUENCE,osp);
         return(1);
         }
 
-/* we return the actual length... */
-int ASN1_TYPE_get_int_octetstring(a,num,data,max_len)
-ASN1_TYPE *a;
-long *num;
-unsigned char *data;
-int max_len; /* for returned value */
+/* we return the actual length..., num may be missing, in which
+ * case, set it to zero */
+/* int max_len:  for returned value    */
+int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num, unsigned char *data,
+             int max_len)
         {
         int ret= -1,n;
         ASN1_INTEGER *ai=NULL;