diff options
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_sign.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index d4fb25d47a..adc85226e8 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem.h,v 1.18 2018/05/13 10:47:54 tb Exp $ */ | 1 | /* $OpenBSD: pem.h,v 1.19 2018/08/24 19:51:31 tb Exp $ */ |
2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -421,8 +421,8 @@ void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl, | |||
421 | int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl, | 421 | int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl, |
422 | unsigned char *out, int *outl, EVP_PKEY *priv); | 422 | unsigned char *out, int *outl, EVP_PKEY *priv); |
423 | 423 | ||
424 | void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type); | 424 | int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type); |
425 | void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt); | 425 | int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt); |
426 | int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, | 426 | int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, |
427 | unsigned int *siglen, EVP_PKEY *pkey); | 427 | unsigned int *siglen, EVP_PKEY *pkey); |
428 | 428 | ||
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c index a225e8970f..fddeec79f3 100644 --- a/src/lib/libcrypto/pem/pem_sign.c +++ b/src/lib/libcrypto/pem/pem_sign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem_sign.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: pem_sign.c,v 1.14 2018/08/24 19:51:31 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -64,17 +64,17 @@ | |||
64 | #include <openssl/pem.h> | 64 | #include <openssl/pem.h> |
65 | #include <openssl/x509.h> | 65 | #include <openssl/x509.h> |
66 | 66 | ||
67 | void | 67 | int |
68 | PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) | 68 | PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) |
69 | { | 69 | { |
70 | EVP_DigestInit_ex(ctx, type, NULL); | 70 | return EVP_DigestInit_ex(ctx, type, NULL); |
71 | } | 71 | } |
72 | 72 | ||
73 | void | 73 | int |
74 | PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data, | 74 | PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data, |
75 | unsigned int count) | 75 | unsigned int count) |
76 | { | 76 | { |
77 | EVP_DigestUpdate(ctx, data, count); | 77 | return EVP_DigestUpdate(ctx, data, count); |
78 | } | 78 | } |
79 | 79 | ||
80 | int | 80 | int |