Merge pull request libtom#674 from cmorty/pem_decode_filehandle

sjaeckel · web-flow · commit 2dd6690edf38 · 2024-11-07T10:46:30.000+01:00
Add missing ifndef LTC_NO_FILE
diff --git a/src/misc/pem/pem.c b/src/misc/pem/pem.c
@@ -310,6 +310,7 @@ int pem_decrypt(unsigned char *data, unsigned long *datalen,
    return err;
 }
 
+#ifndef LTC_NO_FILE
 int pem_decode_filehandle(FILE *f, ltc_pka_key *k, const password_ctx *pw_ctx)
 {
    int err = pem_decode_pkcs_filehandle(f, k, pw_ctx);
@@ -321,6 +322,7 @@ int pem_decode_filehandle(FILE *f, ltc_pka_key *k, const password_ctx *pw_ctx)
 #endif
    return err;
 }
+#endif
 
 int pem_decode(const void *buf, unsigned long len, ltc_pka_key *k, const password_ctx *pw_ctx)
 {

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ int pem_decrypt(unsigned char data, unsigned long datalen,`
`310`	`310`	`return err;`
`311`	`311`	`}`
`312`	`312`
	`313`	`+#ifndef LTC_NO_FILE`
`313`	`314`	`int pem_decode_filehandle(FILE f, ltc_pka_key k, const password_ctx *pw_ctx)`
`314`	`315`	`{`
`315`	`316`	`int err = pem_decode_pkcs_filehandle(f, k, pw_ctx);`
`@@ -321,6 +322,7 @@ int pem_decode_filehandle(FILE f, ltc_pka_key k, const password_ctx *pw_ctx)`
`321`	`322`	`#endif`
`322`	`323`	`return err;`
`323`	`324`	`}`
	`325`	`+#endif`
`324`	`326`
`325`	`327`	`int pem_decode(const void buf, unsigned long len, ltc_pka_key k, const password_ctx *pw_ctx)`
`326`	`328`	`{`