"make depend"

[oweals/openssl.git] / crypto / evp / bio_md.c

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 0d6508c988fe26383c6290a293a58600d17ea440..05f258523e7e1d7de8e818bfd9d63d0f45f4cb0f 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -1,5 +1,5 @@
 /* crypto/evp/bio_md.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
 /* BIO_put and BIO_get both add to the digest,
  * BIO_gets returns the digest */
@@ -95,13 +95,12 @@ static BIO_METHOD methods_md=
        md_free,
        };
 
-BIO_METHOD *BIO_f_md()
+BIO_METHOD *BIO_f_md(void)
        {
        return(&methods_md);
        }
 
-static int md_new(bi)
-BIO *bi;
+static int md_new(BIO *bi)
        {
        EVP_MD_CTX *ctx;
 
@@ -114,8 +113,7 @@ BIO *bi;
        return(1);
        }
 
-static int md_free(a)
-BIO *a;
+static int md_free(BIO *a)
        {
        if (a == NULL) return(0);
        Free(a->ptr);
@@ -125,10 +123,7 @@ BIO *a;
        return(1);
        }
        
-static int md_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int md_read(BIO *b, char *out, int outl)
        {
        int ret=0;
        EVP_MD_CTX *ctx;
@@ -152,10 +147,7 @@ int outl;
        return(ret);
        }
 
-static int md_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int md_write(BIO *b, char *in, int inl)
        {
        int ret=0;
        EVP_MD_CTX *ctx;
@@ -178,14 +170,10 @@ int inl;
        return(ret);
        }
 
-static long md_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long md_ctrl(BIO *b, int cmd, long num, char *ptr)
        {
        EVP_MD_CTX *ctx,*dctx,**pctx;
-       EVP_MD **ppmd;
+       const EVP_MD **ppmd;
        EVP_MD *md;
        long ret=1;
        BIO *dbio;
@@ -204,7 +192,7 @@ char *ptr;
        case BIO_C_GET_MD:
                if (b->init)
                        {
-                       ppmd=(EVP_MD **)ptr;
+                       ppmd=(const EVP_MD **)ptr;
                        *ppmd=ctx->digest;
                        }
                else
@@ -243,10 +231,7 @@ char *ptr;
        return(ret);
        }
 
-static int md_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
+static int md_gets(BIO *bp, char *buf, int size)
        {
        EVP_MD_CTX *ctx;
        unsigned int ret;