X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=perl%2Fopenssl_digest.xs;h=4f2f8938cfc63d7e7804d47760d15d37c2609f94;hb=e8b12f7a6fc96978ecec8c71f7fd4d1e3da6d627;hp=5738b09e48b36dde421cda348a3132d61c69988f;hpb=78414a6a897db42c9bcf06aa21c705811ab33921;p=openssl.git

diff --git a/perl/openssl_digest.xs b/perl/openssl_digest.xs
index 5738b09e48..4f2f8938cf 100644
--- a/perl/openssl_digest.xs
+++ b/perl/openssl_digest.xs
@@ -1,4 +1,5 @@
-#include "p5SSLeay.h"
+
+#include "openssl.h"
 
 int boot_digest()
 	{
@@ -6,12 +7,12 @@ int boot_digest()
 	return(1);
 	}
 
-MODULE =  SSLeay::MD	PACKAGE = SSLeay::MD	PREFIX = p5_EVP_MD_
+MODULE =  OpenSSL::MD	PACKAGE = OpenSSL::MD	PREFIX = p5_EVP_MD_
 
 PROTOTYPES: ENABLE
 VERSIONCHECK: DISABLE
 
-# SSLeay::MD::new(name) name= md2, md5, sha, sha1, or mdc2
+# OpenSSL::MD::new(name) name= md2, md5, sha, sha1, or mdc2
 #	md->name() - returns the name
 #	md->init() - reinitalises the digest
 #	md->update(data) - adds more data to digest
@@ -22,30 +23,31 @@ void
 p5_EVP_MD_new(...)
 	PREINIT:
 		EVP_MD_CTX *ctx;
-		EVP_MD *md;
+		const EVP_MD *md;
 		char *name;
 	PPCODE:
 		if ((items == 1) && SvPOK(ST(0)))
-			name=SvPV(ST(0),na);
+			name=SvPV_nolen(ST(0));
 		else if ((items == 2) && SvPOK(ST(1)))
-			name=SvPV(ST(1),na);
+			name=SvPV_nolen(ST(1));
 		else
-			croak("Usage: SSLeay::MD::new(type)");
+			croak("Usage: OpenSSL::MD::new(type)");
 		PUSHs(sv_newmortal());
 		md=EVP_get_digestbyname(name);
 		if (md != NULL)
 			{
 			ctx=malloc(sizeof(EVP_MD_CTX));
 			EVP_DigestInit(ctx,md);
-			sv_setref_pv(ST(0), "SSLeay::MD", (void*)ctx);
+			sv_setref_pv(ST(0), "OpenSSL::MD", (void*)ctx);
 			}
 
 datum
 p5_EVP_MD_name(ctx)
 	EVP_MD_CTX *ctx
 	CODE:
-		RETVAL.dptr=OBJ_nid2ln(EVP_MD_type(EVP_MD_CTX_type(ctx)));
+		RETVAL.dptr=OBJ_nid2ln(EVP_MD_CTX_type(ctx));
 		RETVAL.dsize=strlen(RETVAL.dptr);
+
 	OUTPUT:
 		RETVAL