diff options
| author | tb <> | 2018-08-24 19:55:58 +0000 |
|---|---|---|
| committer | tb <> | 2018-08-24 19:55:58 +0000 |
| commit | d005d0528a66f69dbf8fb1a50b86c1bf40e135bc (patch) | |
| tree | 43973edb20204a6046f729ce0a80ed7b0b283066 /src/lib/libcrypto/x509/x509rset.c | |
| parent | bf5473ed3db3f13d45280ab553b3c593d8e311ea (diff) | |
| download | openbsd-d005d0528a66f69dbf8fb1a50b86c1bf40e135bc.tar.gz openbsd-d005d0528a66f69dbf8fb1a50b86c1bf40e135bc.tar.bz2 openbsd-d005d0528a66f69dbf8fb1a50b86c1bf40e135bc.zip | |
Turn a number of #defines into proper functions with prototypes matching
those that OpenSSL has had for ages.
ok jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/x509/x509rset.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509rset.c b/src/lib/libcrypto/x509/x509rset.c index cfac977636..de02a40038 100644 --- a/src/lib/libcrypto/x509/x509rset.c +++ b/src/lib/libcrypto/x509/x509rset.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509rset.c,v 1.6 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: x509rset.c,v 1.7 2018/08/24 19:55:58 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 | * |
| @@ -71,6 +71,12 @@ X509_REQ_set_version(X509_REQ *x, long version) | |||
| 71 | return (ASN1_INTEGER_set(x->req_info->version, version)); | 71 | return (ASN1_INTEGER_set(x->req_info->version, version)); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | long | ||
| 75 | X509_REQ_get_version(const X509_REQ *x) | ||
| 76 | { | ||
| 77 | return ASN1_INTEGER_get(x->req_info->version); | ||
| 78 | } | ||
| 79 | |||
| 74 | int | 80 | int |
| 75 | X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name) | 81 | X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name) |
| 76 | { | 82 | { |
| @@ -79,6 +85,12 @@ X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name) | |||
| 79 | return (X509_NAME_set(&x->req_info->subject, name)); | 85 | return (X509_NAME_set(&x->req_info->subject, name)); |
| 80 | } | 86 | } |
| 81 | 87 | ||
| 88 | X509_NAME * | ||
| 89 | X509_REQ_get_subject_name(const X509_REQ *x) | ||
| 90 | { | ||
| 91 | return x->req_info->subject; | ||
| 92 | } | ||
| 93 | |||
| 82 | int | 94 | int |
| 83 | X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey) | 95 | X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey) |
| 84 | { | 96 | { |
