diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-02-09 13:08:29 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-02-09 13:08:29 +0000 |
| commit | d83cbb191355d6a52016dd865bb4fef130dec639 (patch) | |
| tree | 0c98660ab8ed273be1184efc5c280dc8eef82c9d /usr/src/lib/libkmf | |
| parent | be9ad087cc97e02e3d356d4b868c94adf56bd327 (diff) | |
| parent | bf5d9f18edeb77c14df996d367853599bdd43fd1 (diff) | |
| download | illumos-joyent-d83cbb191355d6a52016dd865bb4fef130dec639.tar.gz | |
[illumos-gate merge]
commit bf5d9f18edeb77c14df996d367853599bdd43fd1
9070 Remove wanboot from gate
commit a356818ef9fb10d29d03bcf84f6535092a4efff2
9069 libfru: comparison between pointer and zero character constant
commit cd93da824a7d319a89427338e9055f8e3426b6fe
9066 xdf devices attach hybrid VTOC/EFI label
commit 52f65ab3eff266df424267250ad3b11a31d31b05
9043 ipadm(1M) is misrendering the create-addr subcommand description
commit 41fe9d1ace0a37efcfd9dcbbe786427bf2e9a4b6
8933 libefi: Add definitions and utilities for EFI drivers
commit 4c5582ef5befe9f7cecf33c219b1c314562dff33
8989 Allow IKEV2 pf_key(7P) key management cookies to be updated after set
Conflicts:
usr/src/cmd/cmd-inet/usr.lib/wanboot/wanboot-cgi/Makefile (deleted)
usr/src/cmd/cmd-inet/usr.lib/wanboot/p12split/Makefile (deleted)
usr/src/lib/libwanboot/Makefile.com (deleted)
usr/src/lib/Makefile
usr/src/test/os-tests/tests/pf_key/kmc-update.sh
usr/src/uts/common/net/pfkeyv2.h
Diffstat (limited to 'usr/src/lib/libkmf')
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c index 94225f846a..46aea6a2aa 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c @@ -135,8 +135,7 @@ static uchar_t G[] = { 0x00, 0x62, 0x6d, 0x02, 0x78, 0x39, 0xea, 0x0a, #define SET_SYS_ERROR(h, c) h->lasterr.kstype = -1; h->lasterr.errcode = c; /* - * Declare some new macros for managing stacks of EVP_PKEYS, similar to - * what wanboot did. + * Declare some new macros for managing stacks of EVP_PKEYS. */ DECLARE_STACK_OF(EVP_PKEY) |