summaryrefslogtreecommitdiffstats
path: root/g10/armor.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2000-01-24 12:55:49 +0100
committerWerner Koch <wk@gnupg.org>2000-01-24 12:55:49 +0100
commit0070faa0ffd5c366bc20f477a4838b701c20b063 (patch)
tree4fb8a63c5f2b7cb4b33a51247bdc8961caa89720 /g10/armor.c
parentSee ChangeLog: Fri Dec 31 14:06:56 CET 1999 Werner Koch (diff)
downloadgnupg2-0070faa0ffd5c366bc20f477a4838b701c20b063.tar.xz
gnupg2-0070faa0ffd5c366bc20f477a4838b701c20b063.zip
See ChangeLog: Mon Jan 24 13:04:28 CET 2000 Werner Koch
Diffstat (limited to 'g10/armor.c')
-rw-r--r--g10/armor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/armor.c b/g10/armor.c
index 192a4188c..828113b0c 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -28,7 +28,7 @@
#include "errors.h"
#include "iobuf.h"
-#include "memory.h"
+#include <gcrypt.h>
#include "util.h"
#include "filter.h"
#include "packet.h"
@@ -1014,7 +1014,7 @@ armor_filter( void *opaque, int control,
if( afx->qp_detected )
log_error(_("quoted printable character in armor - "
"probably a buggy MTA has been used\n") );
- m_free( afx->buffer );
+ gcry_free( afx->buffer );
afx->buffer = NULL;
}
else if( control == IOBUFCTRL_DESC )
@@ -1031,7 +1031,7 @@ make_radix64_string( const byte *data, size_t len )
{
char *buffer, *p;
- buffer = p = m_alloc( (len+2)/3*4 + 1 );
+ buffer = p = gcry_xmalloc( (len+2)/3*4 + 1 );
for( ; len >= 3 ; len -= 3, data += 3 ) {
*p++ = bintoasc[(data[0] >> 2) & 077];
*p++ = bintoasc[(((data[0] <<4)&060)|((data[1] >> 4)&017))&077];